Merge branch 'eclipse-ee4j:4.0.0-prepare' into 4.0.0-prepare