Upgrade to mocha 0.13.3 (compatible with Rails 3.2.12)
Adding upgrade_in_progress at the gear level
Move env var creation to correct install file.
Escape early from endpoint creation when there are none to create

* Avoid doing validation and lsof calls when there are no endpoints to create
for a cartridge.

* Fix unit test executions.

* Tolerate absence of /etc/openshift/node.conf plugins.
Merge pull request #2486 from danmcp/master

Merged by openshift-bot
Merge pull request #2424 from smarterclayton/upgrade_to_mocha_0_13_3

Upgrade to mocha 0.13.3 (compatible with Rails 3.2.12)
fix bz962453 - allow rhc tools to work with url cartridges
Pass ws connections argument.
fix 963080 - url is given for downloaded url carts
Bug 961911 - Add lockfile for oo-autoidler
Bug 963156
Add trace option to gear script for nicer error messages
Merge pull request #2500 from danmcp/master

Merged by openshift-bot
process-version -> update-configuration
Merge pull request #2492 from mrunalp/dev/pybugs

Merged by openshift-bot
Merge pull request #2491 from ironcladlou/dev/v2carts/private-endpoints-fix

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

Merged by openshift-bot
Merge pull request #2497 from mrunalp/dev/ws_con

Merged by openshift-bot
Merge pull request #2496 from rajatchopra/fix_963080

Merged by openshift-bot
Merge pull request #2501 from ironcladlou/dev/v2carts/gearscript

Merged by openshift-bot