Bug 1001855: Process all active gears before inactive
Bug 985024: Remove haproxy status page as the backup page.
Bug 1006183 - Do builds from the REPO dir instead.
Bug 1006085
Add support for passing through Sec-Websocket-Protocol header.
Fix for bug 1005007 and bug 1006526
Merge pull request #3610 from ironcladlou/bz/1001855

Merged by openshift-bot
Merge pull request #3608 from mrunalp/bug/985024

Merged by openshift-bot
Merge pull request #3609 from rmillner/BZ1006183

Merged by openshift-bot
Merge pull request #3611 from danmcp/master

Merged by openshift-bot
Merge pull request #3612 from mrunalp/bug/1002070

Merged by openshift-bot
Merge pull request #3613 from abhgupta/abhgupta-scheduler

Merged by openshift-bot
Merge pull request #3614 from kraman/test_case_fixes

Merged by openshift-bot
fix bz1006645
Merge pull request #3615 from rajatchopra/master

Merged by openshift-bot
Update Docs: RHEL needs nodejs 0.6 and 0.10 (SCL). Added note to exclude nodejs updates from epel.
Merge pull request #3603 from kraman/test_case_fixes2

Cartridge fixes
Bug 1006085
Dependency changes for the SCL mcollective package

Conflicts:
	broker-util/openshift-origin-broker-util.spec
Adding oo-mco and updating oo-diagnostics to support the SCL'd mcollective

Conflicts:
	common/bin/oo-diagnostics
	node-util/bin/oo-admin-cartridge
	util/openshift-origin-util.spec