Bug 950367 - Handle non-integer values for expires_in

Any param value of expires_in outside the range of 0..max_expires should be treated as the default value.
<haproxy_ctld> Bug 920990 - fix p_usage showing usage message twice

updated p_usage method to drop straight out of program (via exit!) after
displaying usage instead of raising the "exit" exception
Moving openshift_origin_users out of sdk
Bug 950823

Bash cannot stomach a function with empty body; this caused syntax
error, and the failure to create Ruby applications.
Call cart pre-receive hook during default build lifecycle

Give cartridges an opportunity to perform actions before the default builder
post-receive is invoked and the Git repository is commited/archived to the
OPENSHIFT_REPO_DIR directory.
Merge pull request #2002 from dobbymoodge/BZ920990

<haproxy_ctld> Bug 920990 - fix p_usage showing usage message twice
Merge pull request #2013 from BanzaiMan/dev/hasari/bz950823

Bug 950823
Generate ssh key for web proxy cartridges

Allow mock cartridge to be used in scalable app
Add cucumber tests for platform ssh
Merge pull request #2012 from calfonso/master

Merged by openshift-bot
Fix for bug 951031
We are now correctly listing the acceptable argument to the oo-admin-usage script as gear id instead of gear uuid
Fix for bug 950974
Handling NodeException in the script
Bug 950451 - Add stop_lock support to scaled cartridge restart/reload
Application author documentation
Automatic commit of package [openshift-origin-broker-util] release [1.7.4-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.7.23-1].
Automatic commit of package [openshift-origin-cartridge-haproxy-1.4] release [1.7.5-1].
Automatic commit of package [openshift-origin-cartridge-python] release [0.2.5-1].
Automatic commit of package [openshift-origin-cartridge-perl] release [0.2.5-1].
Automatic commit of package [openshift-origin-cartridge-jbosseap] release [2.1.5-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.7.5-1].