Merge pull request #83 from gilles-peskine-arm/psa-api-1.0-beta-beta2_minor_fixes

API: minor corrections after beta 2; specify psa_generator_import_key for most key types