make rhcsh idle time out a configurable parameter in node.conf (RHCSH_IDLE_TIMEOUT)
prefix rhcsh timeout parameter name with OPENSHIFT_
Merge pull request #4387 from danmcp/master

Merged by openshift-bot
Checkbox isn't aligned with text
Merge pull request #4363 from aaronknister/aknister/rhcsh_idle_timeout

Merged by openshift-bot
Merge pull request #4388 from smarterclayton/fix_alignment_of_radio

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-msg-broker-mcollective] release [1.19.3-1].
Automatic commit of package [rubygem-openshift-origin-node] release [1.19.4-1].
Automatic commit of package [openshift-origin-cartridge-mysql] release [1.19.3-1].
Automatic commit of package [openshift-origin-broker-util] release [1.19.3-1].
Automatic commit of package [openshift-origin-cartridge-php] release [1.19.3-1].
Automatic commit of package [rubygem-openshift-origin-routing-activemq] release [0.2.2-1].
Automatic commit of package [rubygem-openshift-origin-controller] release [1.19.5-1].
Automatic commit of package [rubygem-openshift-origin-console] release [1.19.4-1].
Bug 1042255 - reuse timer for execute_parallel_action calls

* Ensure execute_parallel_action uses the same hourglass object for
  all operations
* Refactor using PathUtils.flock to remove redudant code
* Remove unused code
* Replace all calls to File.join with PathUtils.join. security issue.
* Optimize obtaining list of gears
* use node.conf rather than hardcoding values
Merge pull request #4391 from jwhonce/bug/1042255

Merged by openshift-bot
fixup naming