delete F18 gpg keys and add F21 gpg keys
remove upgrades from F17,F18 and add upgrade to F21