Update Java buildpack dependencies to latest

This is an update to the buildpack cache.

See https://www.pivotaltracker.com/story/show/58814120 for more
information.
Resolve conflicts
Merge branch 'glyn-master'