Merge with default before merge with jdk8u60

--HG--
branch : 8u40-verified-fixes