Bump java buildpack

Alex Suraci and David Sabeti (1):
  kill process on OutOfMemoryError

Ben Hale (5):
  Upgrade Tomcat
  Merge 49892467-tomcat-upgrade to master
  Travis and dependencies updates
  Default JRE version change
  Merge 49892507-java-7-default to master