additional fix for https://issues.apache.org/activemq/browse/AMQ-2103; some tests were failing because of this change