CB-6414 - fixes the issue where two config.xml munges exists, it will st...

https://issues.apache.org/jira/browse/CB-6414