Bug: Both plain-text and encrypted keys used

**Describe the bug**
DB features column in an org stores both the plain text and encrypted key. Some endpoints use the old plain-text key and should be migrated to use the new encrypted key. The plain text key should then be removed from the DB.
