Bug #3392 - Prepare configuration for Heroku
Bug #3392 - Add Heroku support