Checkpoint consolidating changes for Heroku and CF.
First pass at unification work for Paas installers