Please take a review of this fix: webrev: http://cr.openjdk.java.net/~weijun/8201627/webrev.00/ CSR: https://bugs.openjdk.java.net/browse/JDK-8201814 Basically we fix some bugs and introduce a system property so we can interop with everyone. Thanks Max