Merge "init: fsync() persistent properties directory after rename()"