master
8189102: All tools should support -?, -h and --help
8187443: Forest Consolidation: Move files to unified layout