Doc fix for Encryption library
Merge pull request #3017 from kakysha/develop

Doc fix for Encryption library
Minor fixes
Merge pull request #3014 from vlakoff/various

Various fixes