bring in activemq
Merge branch 'master' of github.com:richardc/puppet-mcollective-testbed

Conflicts:
	.gitmodules