Merge proposals dependent on lp://staging/~roadmr/django-saml2-idp/custom-certificate-support

1. custom-certificate-support
2. Dependent merge proposals