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