https://issues.apache.org/jira/browse/AMQ-4341 - some more tweaks and tests from the feedback

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