Update activemq to 5.10
Merge branch 'master' into data_beta

Conflicts:
	build.xml