Some additional TLC for launchers is also needed.
To verify the fix, I've used the new COMPARE_BUILD feature. Bug: https://bugs.openjdk.java.net/browse/JDK-8141444WebRev: http://cr.openjdk.java.net/~ihse/JDK-8141444-clean-up-launchers/webrev.01
/Magnus