Incorporated compile changes implemented by dwelch23344/heroku-java-tomcat-buildpack