Merge pull request #4735 from abhgupta/abhgupta-scheduler

Merged by openshift-bot
Merge pull request #4396 from buckelij/master

<oo_deployment_guide_comprehensive> formatting and minor RHEL6 command fixes
Bug 1056426 - last-access info not deleted when gear deleted
Bug 1062852 - Can't remove mysql from shared gear

Also throw error when gear size would change on component add to an
existing instance.
Bug 1063470 - handle different encodings in files provided by ssl cert issuers
Merge pull request #4738 from smarterclayton/bug_1063654_prevent_obsolete_cart_creation

Merged by openshift-bot
Merge pull request #4740 from jwhonce/bug/1056426

Merged by openshift-bot
Merge pull request #4732 from smarterclayton/bug_1062852_cant_remove_shared_cart

Merged by openshift-bot
Merge pull request #4739 from fabianofranz/bugs/1063470

Merged by openshift-bot
Speeding up multi ha test and fixing retries
Merge pull request #4743 from danmcp/master

Merged by openshift-bot
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