Never use the Puppetlabs repos

The Puppetlabs repositories are unsafe for use on any RHEL system.  They replace system / EPEL packages and upgrade to backwards incompatible versions of their own packages without warning.
Upgrade to mocha 0.13.3 (compatible with Rails 3.2.12)
Bug 958653
Initial implementation for fixing consumed gears mismatch
Initial implementation for fixing district available UID mismatch
online_broker_536
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
Add 'cartridges[][url]' as an optional parameter on ADD_APPLICATION and 'url' as an optional parameter on ADD_CARTRIDGE
Review comment
move SY envs to erbs
move SY envs to erbs
Make scaling info easier to get at in UI