Merge branch 'trunk' of git://git.apache.org/activemq into AMQ-5187