Fix activemq.xml
Merge branch 'master' into data_beta