fix for: https://issues.apache.org/jira/browse/AMQ-4487 and https://issues.apache.org/jira/browse/AMQ-4372

Additional testing and updates. 

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