Merge "Fsync on directory after rename() call"