Make sure not to quit when java is not found. In our config the java
used is not the one found on path!
Merge remote-tracking branch 'origin/prod' into prod

Conflicts:
	init/msm