Merge "save uid/gid/mode information of boot and recovery files"