Merge "[SDNC] Update CertServiceClient"