Bugfix: directory renames were not propagated
Bugfix: renaming file "foo" should not affect file "foobar/baz" even though "foo" is a prefix of "foobar".
Merge pull request #2914 from DennisKehrig/dk/rename-prefix-conflicts

Prevent prefix based conflicts when renaming