master
8169026: Handle smartcard clean up better
8163251: Hard coded loop limit prevents reading of smart card data greater than 8k
8187443: Forest Consolidation: Move files to unified layout