Bug 983605 - Allow to administrator to change the default 'rhc ssh' motd
Rescue usage percentage calculation if it's an unexpected value type
Remove any deleted/missing throttled gears from throttler's memory
Environment variables should be protected with :edit permission
Merge pull request #3432 from mfojtik/bugzilla/983605

Merged by openshift-bot
Merge pull request #3470 from fotioslindiakos/Bug998704

Merged by openshift-bot
Merge pull request #3474 from fotioslindiakos/Bug999837

Merged by openshift-bot
Cartridge - restore mock and mock-plugin cartridge versions
Merge pull request #3477 from smarterclayton/protect_environment_vars_with_edit

Merged by openshift-bot
Merge pull request #3479 from jwhonce/latest_cartridge_versions

Merged by openshift-bot
Bug 999883 - Print command name in usage instead of '$0'
Merge pull request #3464 from mfojtik/bugzilla/999883

Merged by openshift-bot
Better handle applications that use deleted carts

Add OpenShift::CartridgeCache::find_cartridge_or_raise_exception, which
wraps find_cartridge and raises OpenShift::UnfulfilledRequirementException
if no cartridge provides the requested feature.

In RestApplication#initialize, RestApplication10#initialize,
RestApplication13#initialize, RestApplication15#initialize,
RestGearGroup#initialize, and RestGearGroup15#initialize, use
find_cartridge_or_raise_exception instead of find_cartridge so as to
immediately raise an exception in the contingency that the application
requires a feature that is not provided by any cartridge (as can happen if
a cartridge on which the application depends is uninstalled).  Previously,
these methods would assume that find_cartridge would return a valid
cartridge, and they would generate less helpful exceptions when they
instead got back nil yet continued on to invoke methods from CartridgeType
on nil.

In OpenShift::Controller::ApiResponse#render_exception, rescue
UnfulfilledRequirementException exceptions by reporting the problem to
the client.

Previously, the user would get a generic "The server did not respond
correctly" message, and a backtrace would be logged.

This commit fixes bug 993440.