Copy over haproxy.cfg template only if it doesn't exist.
Fix bug 971328 - jenkins creation missing result messages
Bug 974479
Bug 974370 - oo-admin-repair-node should be mode 0750.
Merge pull request #2849 from mrunalp/bugs/974002

Merged by openshift-bot
<app model> fix whitespace
<app model> ssh_url should use gear.name for secondary gears

https://bugzilla.redhat.com/show_bug.cgi?id=971355
For gears that were created since the model refactor, the name and uuid
are the same for secondary gears; however, for gears created prior and
migrated, the name will be a shortened version, and that is what is in
DNS, so that is what needs to be in the ssh url.
Merge pull request #2853 from bdecoste/master

Merged by openshift-bot
Merge pull request #2854 from rmillner/misc_bugs

Merged by openshift-bot
First pass at removing v1 cartridges
Bug 974268 - Squash error messages for gears which have been created or destroyed while the accept-node script is run.
Merge pull request #2852 from liggitt/bug_971328_app_create_missing_result_messages

Merged by openshift-bot
Merge pull request #2855 from sosiouxme/bz971355

Merged by openshift-bot
Merge pull request #2856 from danmcp/master

Merged by openshift-bot
Merge pull request #2858 from rmillner/misc_bugs

Merged by openshift-bot
Add a proper check for rockmongo
Merge pull request #2859 from danmcp/master

Merged by openshift-bot