<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.
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
Merge pull request #2012 from calfonso/master

Merged by openshift-bot
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].
Automatic commit of package [openshift-origin-cartridge-ruby] release [0.2.5-1].
Automatic commit of package [rubygem-openshift-origin-console] release [1.7.5-1].