Rebase on newer OpenSAML