https://issues.apache.org/activemq/browse/AMQ-1894 - tidying up configurations and inserting comments