Merge "fs_config.c: make *.prop files 0600"