Merge "Add separate fa_sha1 field to filearchive table"