Merge "Revert "Import apt-key keys only if they don't exist""