make rhcsh idle time out a configurable parameter in node.conf (OPENSHIFT_RHCSH_IDLE_TIMEOUT)
Fix the Apache vhost plugin

Fix bug in the Apache vhost plugin that prevented it from functioning.

Change V_MATCH_HOST to %v in custom access log format so the server name
is included in the log (V_MATCH_HOST is only available when using the
mod rewrite plugin).

Bug 1058849
Merge pull request #4400 from aaronknister/openshift-origin-release-3

make rhcsh idle time out a configurable parameter in node.conf
Merge pull request #4656 from aaronknister/rhbz_1058849

Fix the Apache vhost plugin