Merge "Fix issue where conference gets logged when no CEP is enabled."