encryption key management and documentation
Merge branch 'encryption-key-mgt'