Merge "[COMMON] Remove CertService client mechanism"