Merge remote-tracking branch 'upstream/trunk' into trunk
Merge branch 'trunk' of github.com:breuninger-ecom/activemq into trunk