Use rhcsh for ssh commands
Merge pull request #2466 from fotioslindiakos/rhcsh_test

Merged by openshift-bot
Initial implementation for fixing consumed gears mismatch
locking fixes and adjustments
add update in progress mechanism
fixup tests
Initial implementation for fixing district available UID mismatch
online_broker_536
Merge pull request #2467 from danmcp/master

Merged by openshift-bot
Merge pull request #2468 from abhgupta/abhgupta-dev

Merged by openshift-bot
Fix platform-scalable-snapshot.feature
Bug 959123: Suppress output from psql command during start/stop

https://bugzilla.redhat.com/show_bug.cgi?id=959123

The command that runs when checking for psql status was very verbose and
this came through to the user's terminal when using 'rhc
start|stop|restart'
status call should echo expected message
Implement status function for ruby v2 cart based on simple curl.
<oo-admin-chk> Bug 958573 - Fix output when ssh key mismatch found

https://bugzilla.redhat.com/show_bug.cgi?id=958573

Update the output of oo-admin-chk when ssh key mismatch found between
mongo and gear.
<rubygem-openshift-origin-node spec file> Bug 963336 - Add 'Requires'
of mod_ssl to fix httpd failing to start on node servers due to
missing ssl module required by 000001_openshift_origin_node.conf

Bugzilla link <https://bugzilla.redhat.com/show_bug.cgi?id=963336>
Refactor trap-user tests
Merge pull request #2472 from pmorie/dev/fix_tests

Merged by openshift-bot
move SY envs to erbs
move SY envs to erbs