[Bug 8485] [PATCH] Adding support for encrypted server private keys