This is basically commits 977b8e86, f261dfc1 and 6d215c0b, making sure the SAML2 classes are called using their old names.
