Merge "Fix CertService configuration documentation"