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
The mcollective logs need the scl prefix

Conflicts:
	common/bin/oo-diagnostics
admin-console spec changes for ruby193-mcollective
oo-accept-node changes for ruby193-mcollective
Node plugin changes for ruby193-mcollective
mcollective plugin changes for ruby193-mcollective
Improve upgrade MCollective response handling
Merge pull request #3618 from danmcp/master

Merged by openshift-bot
Fix Apache PassEnv config files

- SDK: Write PassEnv configuration to the separate file
- Cartridges: Lock all Apache configuration files except the PassEnv file
- Cartridges: Create/truncate the PassEnv file on setup

https://bugzilla.redhat.com/show_bug.cgi?id=969098
Cartridge version bumps for 2.0.33
Automatic commit of package [rubygem-openshift-origin-node] release [1.14.6-1].
Automatic commit of package [openshift-origin-cartridge-haproxy] release [0.9.2-1].
Automatic commit of package [openshift-origin-node-proxy] release [1.12.3-1].
Automatic commit of package [openshift-origin-broker-util] release [1.14.4-1].
Automatic commit of package [openshift-origin-node-util] release [1.14.3-1].
Automatic commit of package [openshift-origin-cartridge-python] release [0.9.5-1].