https://issues.apache.org/jira/browse/AMQ-3097 - apply patch with some additional unit test, with thanks

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