Don't try to upgrade java

vagrant boxes already have it installed for faster provision
Merge branch 'master' into development