This will reduce the number of components that need to be duplicated between the OpenSAML 4 and 5 support Issue gh-11658