Bug 1004927: Don't override JAVA_HOME in standalone.conf
Bug 1005244 - Remove unused INSTANCE_ID setting from node.conf
Merge pull request #3567 from ironcladlou/bz/1004927

Merged by openshift-bot
<documentation> Add documentation for ENV: and ENV:* cartridge event subscriptions

Both the ENV:* wildcard event subscription type and the ENV: type
which preceded it were undocumented. Not anymore!
simplify phpmyadmin requires
Merge pull request #3568 from brenton/BZ1005244

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-node] release [1.14.3-1].
Automatic commit of package [openshift-origin-cartridge-mysql] release [0.8.2-1].
Automatic commit of package [openshift-origin-cartridge-nodejs] release [1.15.3-1].
Automatic commit of package [openshift-origin-cartridge-jbossas] release [1.7.2-1].
Automatic commit of package [openshift-origin-cartridge-ruby] release [0.9.2-1].
Automatic commit of package [openshift-origin-cartridge-php] release [0.9.2-1].
Automatic commit of package [openshift-origin-cartridge-perl] release [0.9.2-1].
Automatic commit of package [openshift-origin-cartridge-python] release [0.9.3-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.14.3-1].
Automatic commit of package [openshift-origin-cartridge-jbosseap] release [2.8.2-1].
Merge pull request #3569 from brenton/BZ1005281

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

Merged by openshift-bot
Further event type doc tweaks

Switched order of wildcard/non-wildcard entries

Moved info pertaining to both wildcard and non-wildcard entries to top
of section, placed wc/non-wc info in subsections
Merge pull request #3570 from dobbymoodge/env-wc-docs

<documentation> Add documentation for ENV: and ENV:* cartridge event subscriptions