fix up broker-config.xml and add test to validate it, resolve: https://issues.apache.org/activemq/browse/AMQ-2895