Merge "[CCSDK] Workaround for naming service host name verification issue" into istanbul