Merge proposals dependent on lp://qastaging/~mardy/webapps-core/saml-1614126

lp://qastaging/~mardy/webapps-core/saml-1614126 has no merge proposals.