Revert "Make options not part of the payload ciphertext"

This reverts commit 6b7dd23cb14f0c8ad07e8f558c616e11ea14e6f3.
Change the structure of the encrypted payload

Ensure options are stored in the encrypted payload for security reasons.
Handle importing of older versions of the apps by reading in the version
number stored as part of the encData structure.
Allow the version number of the encData structure to change.
Fixes #25