Route changes

Conflicts:
	plugins/routing/activemq/lib/openshift/activemq_routing_plugin.rb
Merge pull request #4428 from mrunalp/test_routing

Merged by openshift-bot