remove f20 keys add f21
    
    - patch from Will Woods to use a archmap file for linking gpg keys
    - add fields to /etc/os-release for rhbz#951119
    - set skip_if_unavailable=False for rhbz#985354