Card online_cartridge_85 - Add Mysql 5.5 support through SCL
fix bz 1039787 - delete downloaded cart as part of new_comp rollback and not in the controller
Fix bug 1039760: Add patch support for env vars
Be more verbose when MySQL fail to start
Updated tests for MySQL 5.5
Updated documentation to mention MySQL 5.5
Bug 1040065 - Disabled OPENSHIFT_MYSQL_PATH_ELEMENT via SCL
Bug 1038129 - Gear is not started after restore when hot_deploy marker is present
fix typo - bz1040144
Merge pull request #4288 from jhadvig/restore

Merged by openshift-bot
Merge pull request #4311 from liggitt/bug_1039760_patch_env_var_api

Merged by openshift-bot
Fix bug 1039591: Don't use url basename as suggested app name
Merge pull request #4304 from liggitt/bug_1039591_avoid_suggestions_for_custom_apps

Merged by openshift-bot
Merge pull request #4299 from mfojtik/card_85

Merged by openshift-bot
Merge pull request #4307 from rajatchopra/master

Merged by openshift-bot
Add --no-ri and --no-rdoc to default gem install options
Reverting #4309 at this caused TypeError: object is not a function
added haproxy_ctld comments and ability to run custom haproxy_ctld
allow for customized haproxy_ctld.rb file to exist
updated typos as per pull request