Summary: Also brings in some cleanups from JDK-8048123
Reviewed-by: rriggs, chegar, phh, clanger, aph

Reviewed-by: naoto