Merge "Revert "Put DRLCertFactory as first provider""