move import of rpm keys into base, fix the ones we're importing