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
Merge pull request #3135 from smarterclayton/custom_cart_test_2

Merged by openshift-bot
Check cartridge configure order dependency in the broker
fix issues with move code for multiple haproxy cases
Merge pull request #3132 from pravisankar/dev/ravi/card61

Merged by openshift-bot
Merge pull request #3138 from rajatchopra/master

Merged by openshift-bot
Add global navigation include file and stub build env guide
Merge pull request #3136 from nhr/updates

Merged by openshift-bot
Bug 907410
Bug 975530
Merge pull request #3142 from danmcp/master

Merged by openshift-bot