Merge "[OOM-CMPv2] Release CertService containers in version 2.1.0"