Merge "CEC: Update exception messages in CecPortDiscoverer"