Merge XMLTooling* into OpenSAML. Shibboleth Merge modules now contains OpenSAML...