Merge pull request #264 from adrianlshaw/adrianlshaw/116

Rename psa_generator_import_key