* New: Option to disable Email encryption
(cherry picked from commit 7be5732a3a6679120b0f01bd1eb1207194f57f5e)
* Fix possible NullRef in Email Encryption migration
(cherry picked from commit 271266b10ac51ee6dd7a7024d346b631bd5397c2)
---------
Co-authored-by: Mark McDowall <mark@mcdowall.ca>