Tighten the dependencies on the OpenSAML and XMLTooling schemas