Merge branch 'perf-tool-broker-gplus-thread' into trunk

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1466499 13f79535-47bb-0310-9956-ffa450edef68