Adjusted again the launch configs
Merge branch 'master' into jdk-8
More Java 8 adjustements in collections-jdk8