Fix obsoletes and provides
Bug 1064157 - new filepaths in oo-diagnostics

iptables.*.rules has moved to /var/lib/openshift/.httpd.d .
This commit updates oo-diagnostics with new filepaths.
	modified:   common/bin/oo-diagnostics
Merge pull request #4729 from tdawson/2014-02/tdawson/fix-obsoletes

Merged by openshift-bot
CONTRIBUTING.md: improve commit guidelines

Internal discussions revealed some minor improvements that could be made
to commit formatting. I did some minor reformatting and other
additions while I was there.
Card origin_cartridge_111 - Updated cartridge versions for stage cut
Merge pull request #4745 from lsm5/oo-diagnostics

Merged by openshift-bot
Merge pull request #4746 from sosiouxme/contributors

Merged by openshift-bot
Test case cleanup
Merge pull request #4744 from mfojtik/latest_versions

Merged by openshift-bot
Gear size conflicts should be covered by a unit test
PHP 5.4 - add mongo and imagick dependencies

- add php54-php-pecl-imagick (optional)
- add php54-php-pecl-mongo (recommended)

- move php-pecl-mongo from optional to recommended pkg
[origin-ui-155] Improves error and debug messages on the REST API and web console

https://trello.com/c/nbc4FTwh/155-5-display-detailed-debug-info-messages-from-rest-api-calls-in-a-more-link-next-to-error-pages-whenever-an-error-comes-up

9 commits squashed:

Improves error messages returned by the broker in case of a user actionable error happens on node
Revert to default error message from node while preserving additional messages
Flashes additional messages (like quota warnings) when restarting apps in the console
On recoverable errors display one and add a link to view more details (usually debug info)
Updated flash messages in several places to handle multiple entries
Improved default message
Improves placement of error messages
Improved styles for error messages debug details
Byteslice flash messages to respect cookie size
Bug 1028919 - Avoid spurious calls to mcollective rpc interface in case of parallel op execution
Bug 1064107 - Minor fix in district_nodes_clone(), maker.rb
Merge pull request #4748 from smarterclayton/gear_size_error_not_tested

Merged by openshift-bot
Merge pull request #4749 from VojtechVitek/php54-mongodb

Merged by openshift-bot
Automatic commit of package [openshift-origin-cartridge-phpmyadmin] release [1.18.4-1].
Automatic commit of package [openshift-origin-cartridge-jenkins-client] release [1.18.4-1].
Automatic commit of package [rubygem-openshift-origin-frontend-nodejs-websocket] release [0.3.3-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.20.4-1].