allow custom ha prefix and suffix
Fix bug 1048992: Define remote_request? in console controller
Route changes

Conflicts:
	plugins/routing/activemq/lib/openshift/activemq_routing_plugin.rb
Merge pull request #4207 from worldline/custom-ha-domain-name

Merged by openshift-bot
Merge pull request #4427 from liggitt/bug_1048992_remote_request

Merged by openshift-bot
Merge pull request #4428 from mrunalp/test_routing

Merged by openshift-bot
Add default user capability to create HA apps
adding OPENSHIFT_MYSQL_TIMEZONE env variable
Merge pull request #4430 from worldline/default-allow-ha

Merged by openshift-bot
updating oo-cartridge-guide
Card origin_node_319 - Add quota check to ssh login
Mongoid error on app.save results in gear counts being out of sync
Merge pull request #4432 from jwhonce/origin_node_319

Merged by openshift-bot
Bug 1033581 - Adding upgrade logic to remove the unneeded jenkins_shell_command files

This is the squashed version of https://github.com/openshift/origin-server/pull/4424
Make sessions per gear configurable and use moving average for num sessions
Merge pull request #4433 from smarterclayton/save_failures_leave_gears_reserved

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

Merged by openshift-bot
Merge pull request #4431 from jhadvig/mysql_timezone

Merged by openshift-bot
<comprehensive deployment guide> Fix unterminated code block

Section 9.7.2 ("Install front-end plugins") contained a code block
that wasn't closed properly. This broke formatting for most of the
document that followed.
Merge pull request #4441 from dobbymoodge/fix_adoc

Merged by openshift-bot