Move editing for config.xml into the merge modules. Add a Shibboleth-schemas merge...