Fix bug 962934
Merge pull request #2447 from jtharris/features/Card278

Merged by openshift-bot
Merge pull request #2461 from jwhonce/bug/960880

Merged by openshift-bot
Merge pull request #2464 from dobbymoodge/BZ962714-haproxy_ctld

Merged by openshift-bot
Merge pull request #2465 from pmorie/bugs/962934

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

Merged by openshift-bot
Merge pull request #2454 from fotioslindiakos/locked_files

Merged by openshift-bot
Bug 958653
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