additional fix for https://issues.apache.org/activemq/browse/AMQ-2086; reverting changes since turning off persistence fails some tests