master
8280786: Build failure on Solaris after 8262392
8187443: Forest Consolidation: Move files to unified layout
8146238: [macosx] Java2D Queue Flusher crash on OSX after switching between user accounts