Looking to backport this to 7u-dev from JDK 9. It applies cleanly.
bug report : https://bugs.openjdk.java.net/browse/JDK-7095856 changesets : - http://hg.openjdk.java.net/jdk9/jdk9/corba/rev/0060505fb71a - http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/5534edfe96aejdk 9 review thread : http://mail.openjdk.java.net/pipermail/core-libs-dev/2014-June/027428.html
regards, Sean.