Rebase on CloudFoundry master branch

#### Description
We are having issues with the deployment.  Want to see if rebasing the java-buildpack on last version would fix the issue.

Ping @totof3110