Update java installation script to webupd8 and java 8
Switch to original branch of msm