Merge "Fix error log message for rename(2) workaround"