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
Merge pull request #4430 from worldline/default-allow-ha

Merged by openshift-bot
Card origin_node_319 - Add quota check to ssh login
Merge pull request #4432 from jwhonce/origin_node_319

Merged by openshift-bot
Merge remote-tracking branch 'origin/master' into add_cartridge_mongo_type

Conflicts:
	controller/app/controllers/applications_controller.rb
	controller/app/controllers/emb_cart_controller.rb