Merge remote-tracking branch 'upstream/master'

Conflicts:
	templates/default/activemq.xml.erb
	templates/default/wrapper.conf.erb

Incorporated the changes by berngp that added a library to determine the activemq jar that contains the main classes.