Merge "Corrects usage of log messages in unix socket implementation"