Moved around some functions in hsm_key_factory. Added hsm_key_factory_release_key(). Use it in zonelist_import() when deleting key_data.
Corrected include in hsm_key_factory