fixes a few issues with the new activemq service.

bseeger requested to merge fixes-activemq into master

Did a PR as I had a few more fixes than just the original one.

Merge request reports