support for sparse cartridges (multiple haproxy)
Merge pull request #3121 from rajatchopra/ha

Merged by openshift-bot
make haproxy a sparse cart
Merge pull request #3125 from rajatchopra/ha

Merged by openshift-bot
Bug 983923 - Add "-h" as an argument to get help.
Bug 960355 - Fix file permissions.
Merge pull request #3127 from rmillner/misc_bugs

Merged by openshift-bot
<oo-stats> splitting into first admin library class
<admin-console> reuse admin stats library
Merge pull request #3128 from sosiouxme/admin-console-stats

Merged by openshift-bot
Added system architecture guide
Added equivalent Fedora commands when they are different than RHEL ones
Added 'under construction' note to VM deployment guide
Remove unnecessary meta tag
Merge pull request #3130 from nhr/updates

Merged by openshift-bot
Build & deployment improvements

First stab at implementing OPENSHIFT_AUTO_DEPLOY to enable/disable
automatic deployments after building.
Build & deployment improvements

Switched the expectation of @container.deploy from the same logic in the
model to a simple true/false.
Build & deployment improvements

Initial attempt at OPENSHIFT_DEPLOYMENT_TYPE:
- disallow git push if set to binary
Build & deployment improvements

Switched to key off of 'false' instead of 'true' for
OPENSHIFT_AUTO_DEPLOY
Build & deployment improvements

First attempt at support for deploying branches other than master