Fedora 34/35 housekeeping: update test data etc.
This updates test data etc. for Fedora 34 and 35 releases (I
forgot to do 34 before). Also adds a couple of new subvariants
to the constants: Kinoite and i3.
Signed-off-by: Adam Williamson <awilliam@redhat.com>