make rhcsh idle time out a configurable parameter in node.conf (RHCSH_IDLE_TIMEOUT)
Bug 1043620 - Cannot create scalable cartridge without specifying service category
Updated VM guide for 3.0 & master
Merge pull request #4349 from bparees/scalable_cart

Merged by openshift-bot
Merge pull request #4381 from nhr/VM_doc_updates

Updated VM guide for 3.0 & master
set php-5.4 SCL PATHs for gear environment

Bug 1044881 - https://bugzilla.redhat.com/show_bug.cgi?id=1044881
Bug 1044417 - Fix storage inconsistencies in oo-admin-chk
prefix rhcsh timeout parameter name with OPENSHIFT_
Merge pull request #4377 from VojtechVitek/bug_1044881

Merged by openshift-bot
Merge pull request #4385 from pravisankar/dev/ravi/chk-bug

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