Import Heroku Buildpack Changes

per usr-env-compile email