Merge "Make archive.ar_rev_id unique"