master
8362632: Improve HttpServer Request handling
8377498: Improve HttpServer handling
8187443: Forest Consolidation: Move files to unified layout