Not sure that the certificate credentials api contract is final yet... but committing anyway