Merge "Use REPLACE_EXISTING for rename(2) workaround." into rvc-dev