Merge pull request #6789 from leoetlino/rename-bug IOS/FS: Fix rename not handling existing target correctly
