Merge "Use realpath for log and error messages"