additional fix for https://issues.apache.org/activemq/browse/AMQ-2086 and a couple of improvements for network tests