Enables the encryption_type selection using the configuration + Fixes the missing return.
Merge pull request #80 from novapost/metadata_sp_encryption_type

Enables the encryption_type selection using the configuration