master
8342183: Update tests to use stronger algorithms and keys
8187443: Forest Consolidation: Move files to unified layout