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
Allow plugin carts to reside either on web-framework or non web-framework carts.
HA-proxy cart manifest will say it will reside with web-framework (earlier it was done in the reverse order).
Remove stale file manifest.yml.fedora from openshift-origin-cartridge-php
Bug 907410
Merge pull request #3133 from danmcp/master

Merged by openshift-bot
Correctly create custom apps