Update Java
Merge branch 'master' of git://github.com/pivotal/pivotal_workstation