This is essentially a request to backport the fix for JDK-8076117 to JDK 8u-dev. Closing this bug as a duplicate. Further work will be done via JDK-8076117.