activemq config changed for jobmanager
Merge branch 'job_manager' of https://github.com/chipster/chipster into job_manager

Conflicts:
	src/main/applications/activemq/activemq.xml