Card origin_cartridge_89 - Make npm optional and restrict hot_deploy to supervisor only
Updated documentation for force_npm_deploy
Added contributors' guide
Remove community tag from Python manifests
Updates to admin guide and troubleshooting guide
Merge pull request #4595 from nhr/contributors_guide

Merged by openshift-bot
Keeping tests of same type in same group
Merge pull request #4597 from ironcladlou/dev/python-manifest-tags

Merged by openshift-bot
User Guide: s/deptlist.txt/deplist.txt/

Fix a typo in the OpenShift Origin User Guide: PHP uses "deplist.txt,"
not "deptlist.txt."
Merge pull request #4598 from nhr/admin_guide

Merged by openshift-bot
Allow gemspecs to be parsed on non RPM systems (like the rest of cartridges)
Merge pull request #4596 from smarterclayton/allow_local_spec_dev

Merged by openshift-bot
Bug 1058181 - Fix query filter in oo-admin-usage
Merge pull request #4601 from pravisankar/dev/ravi/bug1058181

Merged by openshift-bot
Merge pull request #4600 from Miciah/oo_user_guide-deplist.txt-not-deptlist.txt

Merged by openshift-bot
Merge pull request #4593 from mfojtik/card/89

Merged by openshift-bot
Configure the MCollective client : mcollective/client.cfg (and not server.cfg)

fix RHEL6 mcollective client configuration file : mcollective/client.cfg instead of server.cfg.
(The same fix should be done for Ferora use case)
Pairing down cuc tests
Merge pull request #4603 from boly38/patch-1

Merged by openshift-bot