diff --git a/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java b/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
index 1292ce1d710..276bf8ffe17 100755
--- a/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
+++ b/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
@@ -242,7 +242,7 @@ public class CertServiceTest {
         certService.uploadSslCert(uploadCmd);
     }
 
-    /*
+
     @Test
     public void runUploadSslCertBadChain() throws IOException, IllegalAccessException, NoSuchFieldException {
         Assume.assumeTrue(isOpenJdk() || isJCEInstalled());
@@ -297,9 +297,9 @@ public class CertServiceTest {
             assertTrue(e.getMessage().contains("Invalid certificate chain"));
         }
     }
-    */
 
-    /*
+
+
     @Test
     public void runUploadSslCertNoRootCert() throws IOException, IllegalAccessException, NoSuchFieldException {
 
@@ -356,9 +356,9 @@ public class CertServiceTest {
         }
 
     }
-    */
 
-    /*
+
+
     @Test
     public void runUploadSslCertNoChain() throws IOException, IllegalAccessException, NoSuchFieldException {
 
@@ -409,9 +409,9 @@ public class CertServiceTest {
         }
 
     }
-    */
 
-    /*
+
+
     @Test
     public void runUploadSslCertBadPassword() throws IOException, IllegalAccessException, NoSuchFieldException {
 
@@ -460,7 +460,7 @@ public class CertServiceTest {
         }
 
     }
-    */
+
 
     @Test
     public void runUploadSslCertBadkeyPair() throws IOException, IllegalAccessException, NoSuchFieldException {
diff --git a/server/test/resources/certs/rsa_ca_signed.crt b/server/test/resources/certs/rsa_ca_signed.crt
index 0b540aa9983..fb74f17574b 100644
--- a/server/test/resources/certs/rsa_ca_signed.crt
+++ b/server/test/resources/certs/rsa_ca_signed.crt
@@ -1,17 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIICszCCAhwCCQCaE4goZabzDTANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgMAkNBMREwDwYDVQQHDAhTYW4gSm9zZTETMBEGA1UECgwKQ2xv
-dWRTdGFjazETMBEGA1UECwwKQ2xvdWRTdGFjazEeMBwGA1UEAwwVY2xvdWRzdGFj
-ay5hcGFjaGUub3JnMSQwIgYJKoZIhvcNAQkBFhVjbG91ZHN0YWNrQGFwYWNoZS5v
-cmcwHhcNMTQxMDIxMjI0MjA4WhcNMTUxMDIxMjI0MjA4WjCBnTELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgMAkNBMREwDwYDVQQHDAhTYW4gSm9zZTETMBEGA1UECgwKQ2xv
-dWRTdGFjazETMBEGA1UECwwKQ2xvdWRTdGFjazEeMBwGA1UEAwwVY2xvdWRzdGFj
-ay5hcGFjaGUub3JnMSQwIgYJKoZIhvcNAQkBFhVjbG91ZHN0YWNrQGFwYWNoZS5v
-cmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANrW6mzOmvTipZiL6N0Lz+T+
-W1qM7iN0k9mOC9fq/U3pN1kIvI8yDF/6eJHQDmr0Hx/GJg4TNZ761kJcB/kCu7zA
-8uILGqh2M3+qhp5zqgPfN7MAxJ65dZPdg+r1mxogHxZUcMTDcEvNKDd73xJDZK47
-iPBie/4RRPQTJS3jbWhJAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAoBURaXgxobxj
-4YEU0IHo/G1UwPhPAKahiDjQH7HxUFJoLEDGUXlP6L8Z7fN22CeX2gQoeAA3w6I2
-Oyb78wBnI3Kwlhr486NGZuxg2DSSfgK2EirIqswMa+P1/XxrArrfr/Ty4qiMEKhg
-ut+HM3oPPMVyU0Tlk/vgwgER5WD/9d0=
+MIID1TCCAr2gAwIBAgIJALXV1B5/vewhMA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNV
+BAYTAkFVMQ0wCwYDVQQIDARTb21lMQwwCgYDVQQKDANPcmcxDDAKBgNVBAsMA0Rl
+djENMAsGA1UEAwwETmFtZTEcMBoGCSqGSIb3DQEJARYNdGVzdEBtYWlsLmNvbTAe
+Fw0xMzEwMjExNjE4MjJaFw0xNDEwMjExNjE4MjJaMHIxCzAJBgNVBAYTAkFVMRMw
+EQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0
+eSBMdGQxDTALBgNVBAMMBFN5ZWQxHDAaBgkqhkiG9w0BCQEWDXN5ZWRAdGVzdC5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpkHkV6ZHhkYc3Y92i
+YllHGbSnXIzwnbaYcfIB5NRldbxyts2Hp8HttxG0rH5DgEMdqfOowqYITe2/hAop
+ZqLuAuwEj0tlPJ/hoVnZeHlCuBps+/nWkanA0DgkwiVksm7UoWM736dkmhLf03FI
+A0/pOsUYranCJAGO26BmNQnocjuoWHZRZINKFNVwgNLrCGkhIu4Dk4o6Rnto0oew
+kwUUVogpUJ6hPFU+8eIV0BAxertuiv6bQC/dG4MhVLl9nRB+XSnf+UAMgH3ay1em
+t8CL4pAlBmctt08LcaLeJBVWH0tsdx/QUuo/5iL61I/eQi4thLureM+bhzDq3/JN
+DYzfAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wg
+R2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBR2LIRfVveDgQB3dC7TOYhX
+BEv71DAfBgNVHSMEGDAWgBSMUs4ge7LDahb4VdjEn9RmLxh0GDANBgkqhkiG9w0B
+AQUFAAOCAQEAPjN/sdLcPfMh5ep29vp/7JTh6dUYnBNATYaXxx8j2XdnMCKeRfgP
+WOJur8HDPSayWWKKlztiQbJV5jDS5vyuMWI1a5/KIAQlOJep+anpR1QnQaX4/M4Z
+YUJo1fPs6tg47dXRpZZaJ+Hqwh0ZftCQoUq/sBxawXf6sbxsjoUmzxQLBqzYo1LJ
+jwxBs6C9aM8LDHFz4TVlyclSFQXiLMosj1jLBQ+TqzCxS6qOfJeMM9STXI9W3F2k
+duXeceqOwEkh8aeSUIztYFpX34d4SA4DDX5GUEaOeOR/abnXjH52vE6tM/m7NOve
+5+I/BrlT3heRqiD6Z2ofSsFhG86YeF9Q3w==
 -----END CERTIFICATE-----
diff --git a/server/test/resources/certs/rsa_ca_signed.key b/server/test/resources/certs/rsa_ca_signed.key
index ece40e47091..d30dd8e8e99 100644
--- a/server/test/resources/certs/rsa_ca_signed.key
+++ b/server/test/resources/certs/rsa_ca_signed.key
@@ -1,15 +1,30 @@
------BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDa1upszpr04qWYi+jdC8/k/ltajO4jdJPZjgvX6v1N6TdZCLyP
-Mgxf+niR0A5q9B8fxiYOEzWe+tZCXAf5Aru8wPLiCxqodjN/qoaec6oD3zezAMSe
-uXWT3YPq9ZsaIB8WVHDEw3BLzSg3e98SQ2SuO4jwYnv+EUT0EyUt421oSQIDAQAB
-AoGAEYwgGf9rD23JB3VYg7j5v4vhuV4JjlA/trccHgEatI+Zv4riy7ygn2WPG2oK
-besLP9n8nS5PI2NLoOCORxpAAVmUQFZvUKE76ElJN9KtNNzY/Xoch54RJ1fCoqL/
-ERMpYDXmVONWSUTRio+SPu3gYDCOZX4wBWV+G6wHRa4m0V0CQQD7d/BvlE37T4kP
-5U3r8LpD05PxqvK18zq4D5oV7DFm3trog+uyScG+oHVNmZTCzujIxhlA7PrpClyv
-MuWBm6f7AkEA3sh0Rx4l1y4htTRIsS3i3QSfhE85Nf1VvYuVJGL1R/ckBlOyWrPV
-XadOxKpnho/sFT9a1FHMFWZtZBhkeGYpiwJAGURW4086eqrmMbOvnaplfNUwg1LS
-6ldTKhVfPR6rZBO2WTCQKSziC75hqvdojB5wI2RMO0rUdz/0SiJKDzjNqwJAauf0
-bIA6FmVLxaG+VE+5sufaCGrgAFl+QIPv4NMf8xXUkritOLtdYyC7OsKvBTKhTpzl
-YEeUUJyjV8ogxGn5+wJAXbnTChiLrfgMOOOAP8acxFPWGfLC3Ae0CAm5CeVJRTSr
-4m6LNHbtqXeYTnr1WQ8A10yNPxyB0l3AaWJpBC3iew==
------END RSA PRIVATE KEY-----
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIN4x8YHLIb60CAggA
+MBQGCCqGSIb3DQMHBAiuWe+C2SitUgSCBMhVxMKivNaQh9SQedh2GQ8vlhI2/mKf
+r6zVUgODOdmFRj/PAlQu6B+VH8u2Ef5tr74O9UyZUQpC6oI0npvQOGqnhIxECR8D
+zepFlC0s+6kNRqfzXiMhGTsfbs3xUE1TZK1z5556OS4GlihIB0E5F7GdlulHELeA
+dnEItqDffWPQczTmSmFqtH7G/ksGQhSA2reBIDNgxWreBh9x9h2TftEvhhogdkr2
+XQpzxcby2v2z6Hut1lfVkLQNdvdHYdDG751NQltOmGvncXkTNJ+tSByXuY9ITtYz
+XqwY/vAEX+YYjCrWcvMmhU1t6B9cZ3viFzIIIltqtvDo3rybicpM3xvmnYnTF35j
+sGebcynzZedrLUHwD6/o0jBzFJN26QBxDGrlmn9E8HBhmjMCeSyZTXtSkwN0dAhu
+EHT2NgdC/4G4+JHsb3Oetl6AbUyYs2eWTRgr6bgBezbiDqKMj1QtGECkPQE9tFFP
+Jtma6lGJ1/u8zLFYNjigKZgXaNbtlMpslk+KDTGaTSbbVEaaxWSc0YlHz329ovQC
+1btrTE71FoNjRsTRaDRXC7BfrrMtnLhG2SmROKzyBtoxFymfEmASpdGERO+c2712
+Z0NLpHJL5ocsRr/onVi0auFC/nuaq6QqYF5OPtZhYh3+IDd193LP3xo8hnFjTq90
+9zV1QI2uHfTfijI4OABYSSZLxrl2IFF7Z/e4XkWSXrneR2Ne5GoYX7w6wshiuubQ
+bDPUHODsy7uQJ3ZEmmmd5xWvA3h3F5Yyls3WEuz8+jYR4iPKdjt8DJuz9j+7IP3C
+LoRa3KhxIPAzziQw+tMFVCozLLfS1kN8mg5SwU9Dp4HUPY/n3KnjVSjUJ347KAgW
++ykPlz4S1H0A2GyGWhdyX3J839UOdXfCsfKQQ1FLOBvhQgBNGzoRIgDrsZdrxgWa
+XtF+Ct2/2/O+503I6X90maXzhshmGw/NKsiNx7YOdUiu6w3N4LajIWE689UUU7Dr
+EtM8HcfmBnE/cZTbeWbQBfl1GqigMp+YOAY2sw0rZdF4ocmnqoCWLVN2j8O/re5g
+20y5eHkztPOZ+NNczo5PP96ng1XEMVzs/h6xDHzsak6osZb5b+Hs9kcYuqBEqr16
+3DVwaZ45dGwNN90Q9YmrgEdCqtCAU12w/YYVB/aB701Ijg0NhVsh7PgWaJIOJD56
+YTaiWIzQaZ/uM0KlgLz2eI9VXcuv24gUMAUMaI84mInnIrax1zFMrlCjEcR8Zxvk
+jCCY6Uq9WH30cUo7cMHWLWMzsl7PC7xpYSHPClqzCUluUgQwqoOs5Ux4nYl+JI7C
+ZfJ8BUMCD2RJtjvJhkE6LEkcrCjwnvappRaXbN54IVXpuMl2XYtp44T117QulEj1
+I/jk1mrpkXRKi9ZsKsjDH9VMy1hcKHn4CgTxmtRYN6LPA4tamxzVLxIi6YDU0142
+l1u763cT7cH14lvzUvEQMFbk/s0AUl8zeZAwjDayNlD/ljz7nZnJ3NToMlxeoK0a
+F6c/RgQBwxR8NMdo19Irv8stxo9WGB2/0Q8WCxW7ENHlBpvX5zXKRJMswFKp0ft6
+dT7hOBPgJlD7C1eX5jVcSz6kDRM6gQ7K/c5QcJa6qNAC2Jw6yBBYltqiRalFWX46
+VcM=
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/server/test/resources/certs/rsa_self_signed.crt b/server/test/resources/certs/rsa_self_signed.crt
index f0dbbb8dcd2..19003efc936 100644
--- a/server/test/resources/certs/rsa_self_signed.crt
+++ b/server/test/resources/certs/rsa_self_signed.crt
@@ -1,17 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIICwTCCAioCCQCRL9B7rcgqFTANBgkqhkiG9w0BAQUFADCBpDELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgMAkNBMREwDwYDVQQHDAhTYW4gSm9zZTEaMBgGA1UECgwRQXBh
-Y2hlIENsb3VkU3RhY2sxEzARBgNVBAsMCkNsb3VkU3RhY2sxHjAcBgNVBAMMFWNs
-b3Vkc3RhY2suYXBhY2hlLm9yZzEkMCIGCSqGSIb3DQEJARYVY2xvdWRzdGFja0Bh
-cGFjaGUub3JnMB4XDTE0MTAyMTIyMjc1OFoXDTI0MTAxODIyMjc1OFowgaQxCzAJ
-BgNVBAYTAlVTMQswCQYDVQQIDAJDQTERMA8GA1UEBwwIU2FuIEpvc2UxGjAYBgNV
-BAoMEUFwYWNoZSBDbG91ZFN0YWNrMRMwEQYDVQQLDApDbG91ZFN0YWNrMR4wHAYD
-VQQDDBVjbG91ZHN0YWNrLmFwYWNoZS5vcmcxJDAiBgkqhkiG9w0BCQEWFWNsb3Vk
-c3RhY2tAYXBhY2hlLm9yZzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtZuL
-mow2ktFcV50aU4On6O5PxWzDWX4118nKJ/qCEjdxArZacSTpdbjBtQdq3DeWAbbD
-d5TdcL0qB0/dZSXmNWt5kEaEmOTm0Yy1HwbT+pKDn+r5KwtICvJogf2VTVpjGNyD
-bmvYE9mCdxmaqZIzGWMrr04ZZX+6AXAlKfYPaRsCAwEAATANBgkqhkiG9w0BAQUF
-AAOBgQBCKbaQ0puIQ7/WzlQCnt8r7z3FIhLJ/pyFL/lyAjr/+8TxEcxZvoNMKza6
-EFAYmHPumJdTQJVWWMOpeY3m3+rKKup+DcGVGmijTG1t7wPhok4JAWm561NUNNaI
-RQFyp9VuTWbgvN6pZCI6RsV9oXj8FnkDenXyX4qlUXXKVa74hw==
+MIIDNjCCAh4CCQD1aM8xUbgZDDANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJB
+VTETMBEGA1UECAwKU29tZS1TdGF0ZTEVMBMGA1UEBwwMRGVmYXVsdCBDaXR5MSEw
+HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwIBcNMTQxMDMxMDE1NTM0
+WhgPMjA5NjEyMTkwMTU1MzRaMFwxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21l
+LVN0YXRlMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxITAfBgNVBAoMGEludGVybmV0
+IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN6wEhbwZgBfgh5+fE1OYm9B7jA+IMbraIY80IyV2ERbNXJoi2/XrDtAr5NAxWkL
+qpaccOA4XupMUWzUCpDxa9M7L/QfCP6PFEJnJZ2dCPvosZQKuFcj+h9LHsK5nVW6
+1Zkh9HhtbdIS6l1JsV/119ZJGxzoGUEJPdEnsNt1cE1cW8sKvMo5GC2toZQV4d96
+17IpMuyRYhdEyRNq+sDQetAUDHYthBK7QVDy/9Sw+/lbgf2OsWacIrysDCF3hXc0
+qyNoBgp/s39NZDXx49GKwNmx9IuRV+P/WEqXfDxSDmHP4APtzDTtMTFnIW8+gH4z
+0GkeLRi7EQY48LyyGcB88lkCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAH5vm8XY+
+jp0Qw3I5jyMI7QYoCdSIY4FoxAMxmCXqOXsem06Yxx55IRgaQR3CTxKY6jOyfBnQ
+P0bLCX4MNaIKIEuLgYr5/g2sbmTWReCfqJRalU69znj6CUpKkIZ3rmxHJQF+BJjw
+A+Eut87o1WOR7quXJOo0cJUjNPRc7+Hjt9U+HWxC8K1jv+/dCv1EdhVGWTdLKWEk
+kApnfTOq66hVsD6FCQ+ohPgCv32wdMxmBSCctSRHE+Zf3GqJheQS+7AIF/y4VVmm
+eDjZGXmCQR9nb24JLkHO2g4ogP5X9nuyzwcOqiw+SITPArH3IadzMV4Kus5tsGUo
+zaPaMXXDmNj8Rw==
 -----END CERTIFICATE-----
diff --git a/server/test/resources/certs/rsa_self_signed.key b/server/test/resources/certs/rsa_self_signed.key
index 043b86541ef..14b95e6ea1f 100644
--- a/server/test/resources/certs/rsa_self_signed.key
+++ b/server/test/resources/certs/rsa_self_signed.key
@@ -1,15 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/server/test/resources/certs/rsa_self_signed_with_pwd.crt b/server/test/resources/certs/rsa_self_signed_with_pwd.crt
index 0b540aa9983..ff46845ed49 100644
--- a/server/test/resources/certs/rsa_self_signed_with_pwd.crt
+++ b/server/test/resources/certs/rsa_self_signed_with_pwd.crt
@@ -1,17 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIICszCCAhwCCQCaE4goZabzDTANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgMAkNBMREwDwYDVQQHDAhTYW4gSm9zZTETMBEGA1UECgwKQ2xv
-dWRTdGFjazETMBEGA1UECwwKQ2xvdWRTdGFjazEeMBwGA1UEAwwVY2xvdWRzdGFj
-ay5hcGFjaGUub3JnMSQwIgYJKoZIhvcNAQkBFhVjbG91ZHN0YWNrQGFwYWNoZS5v
-cmcwHhcNMTQxMDIxMjI0MjA4WhcNMTUxMDIxMjI0MjA4WjCBnTELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgMAkNBMREwDwYDVQQHDAhTYW4gSm9zZTETMBEGA1UECgwKQ2xv
-dWRTdGFjazETMBEGA1UECwwKQ2xvdWRTdGFjazEeMBwGA1UEAwwVY2xvdWRzdGFj
-ay5hcGFjaGUub3JnMSQwIgYJKoZIhvcNAQkBFhVjbG91ZHN0YWNrQGFwYWNoZS5v
-cmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANrW6mzOmvTipZiL6N0Lz+T+
-W1qM7iN0k9mOC9fq/U3pN1kIvI8yDF/6eJHQDmr0Hx/GJg4TNZ761kJcB/kCu7zA
-8uILGqh2M3+qhp5zqgPfN7MAxJ65dZPdg+r1mxogHxZUcMTDcEvNKDd73xJDZK47
-iPBie/4RRPQTJS3jbWhJAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAoBURaXgxobxj
-4YEU0IHo/G1UwPhPAKahiDjQH7HxUFJoLEDGUXlP6L8Z7fN22CeX2gQoeAA3w6I2
-Oyb78wBnI3Kwlhr486NGZuxg2DSSfgK2EirIqswMa+P1/XxrArrfr/Ty4qiMEKhg
-ut+HM3oPPMVyU0Tlk/vgwgER5WD/9d0=
+MIIDNjCCAh4CCQCYwpqRbl2zIDANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJB
+VTETMBEGA1UECAwKU29tZS1TdGF0ZTEVMBMGA1UEBwwMRGVmYXVsdCBDaXR5MSEw
+HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwIBcNMTQxMDMwMjMwMDUy
+WhgPMjA5NjEyMTgyMzAwNTJaMFwxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21l
+LVN0YXRlMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxITAfBgNVBAoMGEludGVybmV0
+IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN/7lJtiEs68IC1ZPxY9NA34z9T4AU4LPS/kbQtuxx4X72XOBy+y0cB/qdMD7JNV
+h8Mq4URDljhSDyVPdH/+jQr+7kWx2gNe2R/DCnd/meVwwU30JJvpGVZXt+MTef5N
+QAbSfDMsuT4FaUY80InbDd24HelrjwunPdY9wwKXO6zL2fLjyDRediiydxcx18Vb
+Dq1cm7DRi4mNkmA3RwBQMhxGp3VsfXJ4Hy2WTRCCCxWHZphAh3EUJGK3idum6/7j
+HbAwpM/t1kNWN8PZiYDZ1HbccgjmqB7Cub10BfB9g1RByiQ/C87o5cKtQha3uuXR
+iBcHISoDydQrgxKgUpiqEF0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEANEPM6lLV
+wIZP6djgUFfEQvxHiw2VEqfPl+zttcILXCW2z5JbuXYQ3anQJrN2lkZQpPT+6/Ra
+338IrJ8F6NK28uji5uwn4f8SWdCxGNAbufwBKJnYbWYuTdhW7bXsRcFYE8kIoc6b
+JLGvr8hL5LFqQyRT8pQgNOfAOkubhC2MJXIX7lAVmRWIUFUufCOHAgQMECcsQA2t
+gTqyfLhdswLRRSWSI1ShxO5XWatxV9F43TzoV0kpkr8P4TdKkwXJviRSlRIR91k+
+i0278LtEglDhDoi9jHqudwl/9dU4TstHRHWoWftJ47w7B0gLuGLdQdhDsaAXlKcl
+kvVCO+go8AmLSA==
 -----END CERTIFICATE-----
diff --git a/server/test/resources/certs/rsa_self_signed_with_pwd.key b/server/test/resources/certs/rsa_self_signed_with_pwd.key
index ece40e47091..d645a716632 100644
--- a/server/test/resources/certs/rsa_self_signed_with_pwd.key
+++ b/server/test/resources/certs/rsa_self_signed_with_pwd.key
@@ -1,15 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDa1upszpr04qWYi+jdC8/k/ltajO4jdJPZjgvX6v1N6TdZCLyP
-Mgxf+niR0A5q9B8fxiYOEzWe+tZCXAf5Aru8wPLiCxqodjN/qoaec6oD3zezAMSe
-uXWT3YPq9ZsaIB8WVHDEw3BLzSg3e98SQ2SuO4jwYnv+EUT0EyUt421oSQIDAQAB
-AoGAEYwgGf9rD23JB3VYg7j5v4vhuV4JjlA/trccHgEatI+Zv4riy7ygn2WPG2oK
-besLP9n8nS5PI2NLoOCORxpAAVmUQFZvUKE76ElJN9KtNNzY/Xoch54RJ1fCoqL/
-ERMpYDXmVONWSUTRio+SPu3gYDCOZX4wBWV+G6wHRa4m0V0CQQD7d/BvlE37T4kP
-5U3r8LpD05PxqvK18zq4D5oV7DFm3trog+uyScG+oHVNmZTCzujIxhlA7PrpClyv
-MuWBm6f7AkEA3sh0Rx4l1y4htTRIsS3i3QSfhE85Nf1VvYuVJGL1R/ckBlOyWrPV
-XadOxKpnho/sFT9a1FHMFWZtZBhkeGYpiwJAGURW4086eqrmMbOvnaplfNUwg1LS
-6ldTKhVfPR6rZBO2WTCQKSziC75hqvdojB5wI2RMO0rUdz/0SiJKDzjNqwJAauf0
-bIA6FmVLxaG+VE+5sufaCGrgAFl+QIPv4NMf8xXUkritOLtdYyC7OsKvBTKhTpzl
-YEeUUJyjV8ogxGn5+wJAXbnTChiLrfgMOOOAP8acxFPWGfLC3Ae0CAm5CeVJRTSr
-4m6LNHbtqXeYTnr1WQ8A10yNPxyB0l3AaWJpBC3iew==
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,CCA6E4CB4C4039DD
+
+TaVCJtB0dE9xTZbX7GOaGJwwGHVAMjU1GbRIHf0jODdP+quZvbjklNqsw8Ozlia9
+q/G+UqtRJGlIPPLpce0YCrTo0P3eixZdMs0+hioAEJ4OLtL0SAC6b8q/gB6HRfAx
+BvNg+umTqeF9YB68Tcuv/2g4VGKiaePQACyOzMdf7lGY7ojxoJCYZa1mfKb7jWrg
+FLwmTtLLhNjb6CnOKo3klIef3A6zdutpgxF1gARzdRyXg4qCA3boYnwEptTOlJFu
+ovxbhDG9iuYYr4gXYSs1pLYptEC8J6iWpG/qzkwfr4l5Cfg5uF00bbxQE5+WeRaj
+YFicvXjB/kcoFZuCL7M/YRXYxkJ/EZ19xI9HZNBQ4L738StkSBKL4OhpF/qgYZ2y
+ZLRV6XT4AijUA0Ef7YTuUsTL7Qt9drj09gCtAzXTA7gpZBn5SqT9kWhuwSzY302l
+KF8DIC6A52igk2QKPLbleM/V8eCu6n+J4uF+0GwVRROuG7ThxAQiUlJKhoEYrndL
+nzT7jHVLftjilhVWFu2On62bRf5t1QZuob+1AdK0ukvEIVsYnN4bnlAkc99Wi6C0
+ZJd9qW5L4A9XAC2gcjr3m0Rzw3RO+k17faR8YfmTuJvGyBf5fnrSFoNkrninXQXp
+sk0ajRi4PJ4XTswLyxjWRSt3egNsZBSKnVCibca/QoDEdZHSKXo2FlYiUYx8JHQX
+SPUsLl9OQKC1W8/+ReryqBLHCkiGEsvT8gVaXga0uhVaqe+PaVur2tbOHl4yCysC
++ZlnKwsC84LQsUvpENdCh+D7E1I1Rao9IJMR6q9azKq8Ck63cOJ1fA9xSnxJGoCA
+IlGLttlXrR32EtzYwEnlqf1nI/IqNQrAXQKrP5VPzHsgMFu5uD4OEZa92Q5cVTsz
+ap/1UEqiJVYUt6nuA+aqOUlyjC0oNtYL/VO4DbHTFcHa8SI2cPSS6ebPMWPGHjUm
+l9bWa6Q9iyplCYS6hinAVsAaLVjPi1Eu9Pc8rxFCmoiJYJju5NZuGI5UBK64dqcX
+T6trWl0kB8QY63JtnrZaoStoSPImV5KVseUKDV8TM3Y76h1nLV3MSmAD1ivk9oKs
+VKeVrDhZBWUq9Dqre/+lVGO0a2wo5VTR8hfpf8QkODPLeyNZNdfGKzkkFLuXa8V5
+ELhLQJ3FnbEU3NEvMwikV9MhP/ELPTkZwJr/NKv+9JLs9eXtwz29I/Q8byQVrCCs
+hAuDl0zHGRnqdpdSImeS2EXGx631zGMwSe8fhKelni5h6hXrXz52asr0k30BxWjf
+WUn1uTInwVjWGy9B5j3mZlVDotFbvVAZgtR0IoFwihPl4VZd9oS13l+hMfrTy1YZ
+8xFNg8ZqUQ0lSmKfOVqSBT0lP8tM8LuGxgY4cWluhsAQxR5Nl7wkundnqjcwEDDu
+Jz2rD54St1EZYGLDJZSfC7mpG2PgodsdeopQCTyFhHWa8s3caZ40GFOwaR+/5+YF
+1oRvkR1Yr4qIS7KbX4xsaFfAA5b8QfLA74L05PAgDwKofam2GFAlAKHOcI6mexPq
+aySON9MNdnXBNxs16mBJLzCX5ljQb0ilJildVEI3aVmABptM4ehEiw==
 -----END RSA PRIVATE KEY-----