Fix for: https://issues.apache.org/activemq/browse/AMQ-1116 https://issues.apache.org/activemq/browse/AMQ-1575 https://issues.apache.org/activemq/browse/AMQ-1577 https://issues.apache.org/activemq/browse/AMQ-1581