Using 5.9.0 as default version of activemq
Merge branch 'master' of https://github.com/example42/puppet-mcollective

Conflicts:
	manifests/stomp_server.pp
Merge branch 'master' of https://github.com/example42/puppet-mcollective

Conflicts:
	templates/activemq.xml.erb
Release v2.0.14