Fix for https://issues.apache.org/activemq/browse/AMQ-1452 and https://issues.apache.org/activemq/browse/AMQ-729