Upgrade Java buildpack to v1.5
Merge branch 'master' of https://github.com/glyn/dea_ng into glyn-master