CONN-231: Fix for Cert mix up issue.