Fix for: https://issues.apache.org/activemq/browse/AMQ-1704 https://issues.apache.org/activemq/browse/AMQ-1679 https://issues.apache.org/activemq/browse/AMQ-609