diff --git a/systemtest/src/test/resources/custom-certs/ver1/chain/clients-bundle.crt b/systemtest/src/test/resources/custom-certs/ver1/chain/clients-bundle.crt
index 1c4d5877070..69d9da01a09 100644
--- a/systemtest/src/test/resources/custom-certs/ver1/chain/clients-bundle.crt
+++ b/systemtest/src/test/resources/custom-certs/ver1/chain/clients-bundle.crt
@@ -1,65 +1,63 @@
 -----BEGIN CERTIFICATE-----
-MIIDlDCCAnygAwIBAgIUXd7HCZ9lxOomoklWhy+rPQHW9a8wDQYJKoZIhvcNAQEL
-BQAwVDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMRcwFQYDVQQDEw5JbnRlcm1lZGlhdGVDQTAeFw0yMDAx
-MjExMDAxMDBaFw0yOTAzMDcxODAxMDBaME8xCzAJBgNVBAYTAkNaMQ8wDQYDVQQH
-EwZQcmFndWUxGzAZBgNVBAoTEkpha3ViIFNjaG9seiwgSW5jLjESMBAGA1UEAxMJ
-Q2xpZW50c0NBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsnqoDUGX
-NYK4CnQD9OpOESV6vdE7134+/O9rjGQy/4KeYjt6/Cb2+2ofQbQKIR2I6Lx+tTAy
-EyajI6oGqP2ddgc1v8NuU2B/qViAamtT79oabIlFWnt/SLQEsv5AcUW66v/vjUJe
-per+jFirvsgTMJ/KZJdwdqLRNmnZIsHaNlk+0EXI6zeFQoYqj8LQUZv0deQW34tN
-oMf5RlLuhAiTvFFOnj23+BdrKtY+e+sanfb7o7gzBc/apefXGigfQCeiiozpuA8d
-Dk9LYK9L5p0dxedgh6tpNsQCA2nJzN6+WuEn97+ncZWD920ntR8vjKbuNF7R/ylM
-AsvSp5gCOskSWQIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUWxMyRmFcWjgmhYdfkODvJ8mHITcwHwYDVR0jBBgwFoAU
-tWEU/T+TTSDj5hOUvcUqCjpWzKkwDQYJKoZIhvcNAQELBQADggEBAJYQrbaP+MVP
-M+pSToL8TwsZmf8f0EjUBKa5C96nvepMFxR2YW0R+yI+JwbzobWhZJL3RqQKBYlQ
-XmwyM6FFV+gLqVEUstGvhopk5dWv0378/kIUJV0J7yEgCXEBjUSiKiIcJveDPlvZ
-SFBOgrzVQIqckUhqitXdMP8BdjFvSbeOpZELyAis8wFDM8BI65LWW1DAepxuhbku
-PgutpPFnJi2DFvGEw3XOuXY6BKjM9CXGf9AQrxLXhcOBVIVgr00NqPSyzT8HzlJt
-OjCrw2XzObQ47lLf6yULE2eEE8f6XufEmjbKl38ruyIk7IMw1KmWfeG057YqQ2St
-1rCJMy02LUI=
+MIIDjDCCAnSgAwIBAgIUTW3j8gazwDZL1xhfZ/zrodg7faowDQYJKoZIhvcNAQEL
+BQAwUDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEeMBwGA1UEAxMVU3RyaW16aUludGVybWVkaWF0ZUNBMB4XDTIwMTIyNDIy
+NTAwMFoXDTMwMTIyMjIyNTAwMFowSzELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlBy
+YWd1ZTEQMA4GA1UEChMHU3RyaW16aTEZMBcGA1UEAxMQU3RyaW16aUNsaWVudHND
+QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL4EHGiM+Kj2tjaQzq4D
+oMlkt38Yae7ydKrOWFR3xYttbjlMLXr8pl3pHa3tCX4yhWJHsbiXINwm9ZusGogM
+/rUqdOyyXxRW2NqKEElsqJrhhQPmqFKa101Tgicb8T84vVdtSlSdsJBhr4I907kd
+zmSrI/dfx6vjiuqBt4d67/QcuuDZMdZ0mfMdgOCbM8cHIwiKO7lknFP5wvJ5H/Cb
+2jhnzfLM7XlIx9J+8gIDtbgo5rtp4QiC4hg+BHyu0iGewEXjAYp1ec6STVyz60lv
+VG+qrEUeKIyXNZRoyPtcYa162tYLZJKT2kaueiw2sqN0YMmDurd8Jv1GQJVW8rMJ
+IwMCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgIEMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFPiL7BeYsf6RUonphbchHb23c8AvMB8GA1UdIwQYMBaAFB3GIzYx52BD
+TZhONk4XvvrKINm+MA0GCSqGSIb3DQEBCwUAA4IBAQAM7g9uzun9U2jZ8R/Xe+hA
+36ceciICHKCsNY6/1FOaaqYvtVnbrmJwsO2Mh3lbGwzlJjvWtHvaaZDFMkDlcFrj
+SKWtAmO/1RE0PYtCwkzxjEt47D8WhnswlJcUR9SJ9tYNTCNPxYdB8QsPihrAWtNS
+tGCs6nmm3yuflt4i0Sl3f1YLYU2YBBIPNg3YI96vqljpxIzT+lWY8gQBGhKhX3DD
+HvH1pIjIYizzmK8aRG4tKJ3XOtY4LHtCL05yfSjDbkHmP8LMKtFQokMGr0xfAwv1
+JW0VnkF7+W8Pybh3OJqP+9V/2HOAI+EqSTwXxLKt7oIZa6aqKB4oDm5/khe1o+KV
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIDkTCCAnmgAwIBAgIURcQMUIuoPPkw2T1wQ30S+f5Rf+gwDQYJKoZIhvcNAQEL
-BQAwTDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMQ8wDQYDVQQDEwZSb290Q0EwHhcNMjAwMTIxMTAwMTAw
-WhcNMjkwMzA3MTgwMTAwWjBUMQswCQYDVQQGEwJDWjEPMA0GA1UEBxMGUHJhZ3Vl
-MRswGQYDVQQKExJKYWt1YiBTY2hvbHosIEluYy4xFzAVBgNVBAMTDkludGVybWVk
-aWF0ZUNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp9b+TCOGhBgb
-wO7d+Npw9O5TObEbTQFWAU1XMupB1VhScv+xs9z64/uViPS/gYJ1QmLJoaa1CM0B
-vg3wUoPYPWnWUzz6GTuMhldBuCzuIuASKjbXxkxrQBdZIP/ojqVto739QMaLtzRq
-2pZUuTM7mGMCQRP7faEZ4d7JLu5bF0EAKyw/BRf+vs/nYReYSr5D6p79UPbsHiq7
-O+YNAaY8rpkMGq9CQRQGxa5xVKPvnTLp+SYzzaDNZUroNn6KO/wFythod9qGAFON
-uBcOkLSIZNMKPX2nwwCeqDdq6vCYsaXS7TI/JgYdBRWNeEbi/vfMtPib6eijWLfU
-3DK0QNKx2QIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQUtWEU/T+TTSDj5hOUvcUqCjpWzKkwHwYDVR0jBBgwFoAUaHrh
-e9+8hu9fAPZuOUh/jV2/CBQwDQYJKoZIhvcNAQELBQADggEBANlQ/k1qQEiruB4c
-b8OYbtUguvaWcYJOuVuBGjgLYdgY3uZxZ7CWXtSLLL6cCuJ2iT1V5MWga5AtUh6P
-+8LsuKIMPXmg263wSbeqVRY0RFMJYJ29oWxukd5tSxEYjrjbHpcPluHrI0/RiqzK
-Ewwh+oi+sA1Gye1DeDOYjE2kdIpka3xfManrmJ0LfQ3e85qkVFTeqWJ5u2D0EEFQ
-l2sIg7NQlci30LixHxx8o2ABq7t4Bi3UBZ4YfMFsu46Uus5Iu4TDsEq0V9VhTLzG
-TLzwuznfAz23rBB8BM+r94NQ9TMof8GJBVIUj6aMQ2D3aI/EOBetpk5qiNEI74Vk
-aT8r1Zk=
+MIIDiTCCAnGgAwIBAgIUO6nl6uydnFw1TUOrainPL1W8+uAwDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEWMBQGA1UEAxMNU3RyaW16aVJvb3RDQTAeFw0yMDEyMjQyMjUwMDBaFw0z
+MDEyMjIyMjUwMDBaMFAxCzAJBgNVBAYTAkNaMQ8wDQYDVQQHEwZQcmFndWUxEDAO
+BgNVBAoTB1N0cmltemkxHjAcBgNVBAMTFVN0cmltemlJbnRlcm1lZGlhdGVDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMtgqe5wXO3ZlRmHv4p4z+nG
+xPt6sgdxJxoxWHuNWHYnRomJmoa+bYPWB5kijZ4MUBH2jV2uVq+lZdaJxf+RBpSQ
+Xi/lLtOpQmI3O4GcnDYEu/rTnIQTl1XoDlrB88tQqdkFPAANkafguPwNYiFSEkn/
+XLmC2A2ontuWo6WPpIMFzbra5NSA/PTN+g7bq+X2q7yuKI0TFyRcc0lEXfnpe0j5
+xaeF0oX2NxBCi4d9oGh9ZJX6cEhIkF/Ff1RPCvIpENZOQ1SGI8T6xZCVSGiL178/
+8/gRXE7hWRwRfL7QGo3RIwe8U8NEjysKdZZaHVPEErZhR/FMQxxvioWu5YLFAbsC
+AwEAAaNjMGEwDgYDVR0PAQH/BAQDAgIEMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFB3GIzYx52BDTZhONk4XvvrKINm+MB8GA1UdIwQYMBaAFL5HYvT/4o/gRvic
+DCz+A22/8wZsMA0GCSqGSIb3DQEBCwUAA4IBAQC1WvbMuCtNfHQ0D7e4Ht60eE3K
+LdQ4xPKWndt3o9pk/8MsWpi55SqKP8xGmLOxwysDLEgc5m31qnDYI1FV5c+sBKWr
+oAXK8MIfsnYaaGB8BNk1dspZpst7kOxLeoAsHkZb9DMAirrrSDFmPeMweO0kzUHE
+dDHarN0iiGAB7+oNYt/V2YCDlOTBlAGQ4gwL6enXIXzfTIOBqjIE1uOzbF2RbZLp
+Lhj6n7CzmH979Pr+IzgOUbMuEcRNH8rO7PvJf6MIJp/D436wPUZpnP+xZP/emELW
+pWxbBUsQwIttHM9gcitVd2q7PVdKYB5+ETpXWlC3WQdGqhC8H0AnPL74jPkR
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIDaDCCAlCgAwIBAgIUfwjp9G2vi3tYh1DIf0Xcn3BK40MwDQYJKoZIhvcNAQEL
-BQAwTDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMQ8wDQYDVQQDEwZSb290Q0EwHhcNMjAwMTIxMTAwMTAw
-WhcNMjUwMTE5MTAwMTAwWjBMMQswCQYDVQQGEwJDWjEPMA0GA1UEBxMGUHJhZ3Vl
-MRswGQYDVQQKExJKYWt1YiBTY2hvbHosIEluYy4xDzANBgNVBAMTBlJvb3RDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOCXYKPUJ0kobSQzQMmK/iOA
-a37jRS4aJcvO9g5r5QQZzfO1/X9YAzeI/bG66bcgvKYI4MBZDYoDRpuER7Q/FFZf
-4TV/pF4TL6XrlOFBclT4/HOF2SxozR6QhbajHjnTdRirH9Yhbq6G66B+Gcz4reGK
-ggwcECkO34M3BsK+QH062+XBmU6HGwCdh2SNOfe46nh47UBEcOkQSepLszsLj7pR
-DrcrX/V7q6oO7m2jCoDJ84NmBM7DFoDXcsGpHZBNhuxMlfsMwqvBU1dG850hUVND
-uaya8dAh3we2Wd6EHXEMlpZb0BcsHasHDl3WMm/OHKdEXlts9lQmkjz+1p1iXOsC
-AwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
-BBYEFGh64XvfvIbvXwD2bjlIf41dvwgUMA0GCSqGSIb3DQEBCwUAA4IBAQBJCQp7
-lXS/Zkzqg9h+SFiZZD4yD4J8tjol/TubDA18q66vQl+sOqxyvrBZcx9oBNLMbjei
-AZIJfQF68Wek+lZp61mvgTG4o9syus43SEg2nzN2rMYvQVx5qtpSx5YmQhdVmsqJ
-azoAlqFoMQXGXJ2YZo8y/M06Q9F3A6BWksAEZfbBaqCswseUn44JstQFhIpbC50I
-+6zx9gp6riE0FXzNlq2Gi06yixRiDw9oZB2/+CTW2zFHKyX2DFhey7EL92ESSrpm
-PUG3pPD1l+j86EyJjAEB1u4TlWH7PTbV8nuNbCXut1WI+IrplSgwEtXz8i0YcYty
-S1vO689r9LDTVB+V
+MIIDYDCCAkigAwIBAgIUT98LRnK52FTHAIt0KmA43bkwSYkwDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEWMBQGA1UEAxMNU3RyaW16aVJvb3RDQTAeFw0yMDEyMjQyMjUwMDBaFw0y
+NTEyMjMyMjUwMDBaMEgxCzAJBgNVBAYTAkNaMQ8wDQYDVQQHEwZQcmFndWUxEDAO
+BgNVBAoTB1N0cmltemkxFjAUBgNVBAMTDVN0cmltemlSb290Q0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVaVPSw5348JYOqA65LudkzG3FxUvq2pLJ
+DUPLHsA/IGdtTHARyXcq3QL1TZ/1pR+Wg4Faj3Jd8GbEbi9dtL2qYPR7a80IFtdG
+uqlyw46Hf+zZV4CSVkKeqA7HshbNWpkP416FfR+3PLOIvMQAxrbn7GZfyJfdgPgx
+9mAn/jwhwGyTd9qU9SexAztepZ+YsBd+wpguFRpjF+iRy29didXWpxih/y55FC+m
+Q+PDCw1Hzlbhydt+7mYLaukEo8EWrbv1Ad6fNBITYeeCpdfF9P+BEe4X6oI7gL6C
+YMeNkf2GsceDjejUwy8QrHAtw4Kzs0fSHWbec9UXq8lXOAIRR+ofAgMBAAGjQjBA
+MA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS+R2L0
+/+KP4Eb4nAws/gNtv/MGbDANBgkqhkiG9w0BAQsFAAOCAQEAXqA6GCH8XxVOlWUg
+lo8kdLeGN4qdq2/nNEuPDe+MYxzuGxYS1ECatuzs9cGOBvpSsAw8z1iNJvf1Ea6l
+ijLDVoiTzCA6OxlPINzfbg0jafMDn2CvdCMH4ZHr6W+J0L4dzYwk8cWnUE7HKiMp
+gcg8NoQ7T9Sm6FaG77Zzct5WQ/HlKQlpJt40pIw4hRF2KyqgoSYkN2CJHHO047KN
+mpl2S0P9J3au03m63uAOM88GiRGQsguQnsBE4+hYhopqAwDYWSxjFYkKueKOo9bO
+f+xwwjvm0N+p0+TTPW6JH3TQykowKKnAnNkWviAbZmtR3z1H0A9YXnNPxbefMFFI
+wPKoPg==
 -----END CERTIFICATE-----
diff --git a/systemtest/src/test/resources/custom-certs/ver1/chain/clients-key.pem b/systemtest/src/test/resources/custom-certs/ver1/chain/clients-key.pem
index fd1ef7c321f..9f92a4bf508 100644
--- a/systemtest/src/test/resources/custom-certs/ver1/chain/clients-key.pem
+++ b/systemtest/src/test/resources/custom-certs/ver1/chain/clients-key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAsnqoDUGXNYK4CnQD9OpOESV6vdE7134+/O9rjGQy/4KeYjt6
-/Cb2+2ofQbQKIR2I6Lx+tTAyEyajI6oGqP2ddgc1v8NuU2B/qViAamtT79oabIlF
-Wnt/SLQEsv5AcUW66v/vjUJeper+jFirvsgTMJ/KZJdwdqLRNmnZIsHaNlk+0EXI
-6zeFQoYqj8LQUZv0deQW34tNoMf5RlLuhAiTvFFOnj23+BdrKtY+e+sanfb7o7gz
-Bc/apefXGigfQCeiiozpuA8dDk9LYK9L5p0dxedgh6tpNsQCA2nJzN6+WuEn97+n
-cZWD920ntR8vjKbuNF7R/ylMAsvSp5gCOskSWQIDAQABAoIBACGqdUya1LTpRWHj
-ZGOsVrFxSmfHsewCCkuXtcezltMPhmStJ5OsneXqrJ6uIUMB2TNdauEuiCOIpDkz
-9zGlNTBwR7k2WfcsOqhs4zwvppOVpmpWslhQ9z91hXVl9C3po0p0oHEa1dOiMgWz
-LCI+hzAi1ACJeFNIfwIukSC3RDv/5HmzXhDstptCnX71H+Lw9j/69vMi1pPd5uDE
-/G/tV8RJzBIwAJFOIXI2v/74LltAUAa5peG1RZdrB3p1/HsRsZwac9DD4rk5meDD
-o5inQYgnjlvu/G2pSZ/BYros6Eiqcb0WN/j5lbdEwItZAKtaerezfM+IBpssDAOk
-po4zziECgYEAwB23Qxr/aRXWif+biABcFWp00N8SOiB0W6Btf2drujw01Tfb9Hs0
-xnfyRVw5pAwW6fMUjNpi92UURjR0uATJVeuUCCdPSz1TLQi0KxfMaCq3UtsNkP2y
-9TwBsRxKhs0gJoWEG+X9M1vXfKAhPGmnrSRcLptc0vfI8CJ0yBUnIA0CgYEA7dQR
-CIUnrVexea5gDE1r6h/+bwC50TgVw7JS/8NnjUzjGpielwUiNAloNszFsFE1hyC4
-l/oS0df8jO6IpCKDr10oraT3k+p9u062qHF8DHhqhiBO+oteWWuwHG0oxWqoj6Qu
-xEMfvCaSPApQ00eLczcQAWLJkh33gw9KsZOhHH0CgYA5JR2sAk3SzkIgjj2POLwr
-Sp0wvAnJ7Hlv/8pSSUsL/Hiiq5jrofJSzr7rzsD+gPIX6MxGEXe6qwBa2aOWUSYq
-Poar3jWB5d3l2V7uKogMvBgHt0zTwgMHWzANpKKucjmL+88OFV05d6ojUeZQ+AR+
-RgB9hI0Z28aTV0xxb4lRyQKBgH2oldNdn2gsNF5pbuAxK/qJKwL1bDiKHJ3Io6f1
-U8pJvJi52NlMYhUCf2is6yrMza528HGENNtg9lR0WAf5IIDQhQSybAlgVUxZO5Nm
-WrewDACQI4qnhpNSnbt3RZqBT0yN4BPcr3DXJF7KyIfJfnnCtxc0XfJxGOzLcJjA
-uth1AoGAfphTRHKbd4UptM73+KpftSh2fqi3fMou0HRSLgDVQK19RXkso/KwYH22
-eGe0MYvLtpaIYw29quUv6uFrYBUFHchjduJTHBBvSsY5Y2l1blX9aAC0IhjxPk8m
-1VNNY8LEUqtr0b2oHYysmm8HrgmHJ3D7OHlNVt/LoFxG+CUB5SM=
+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
 -----END RSA PRIVATE KEY-----
diff --git a/systemtest/src/test/resources/custom-certs/ver1/chain/strimzi-bundle.crt b/systemtest/src/test/resources/custom-certs/ver1/chain/strimzi-bundle.crt
index 72455f0d412..6d7916928e4 100644
--- a/systemtest/src/test/resources/custom-certs/ver1/chain/strimzi-bundle.crt
+++ b/systemtest/src/test/resources/custom-certs/ver1/chain/strimzi-bundle.crt
@@ -1,66 +1,65 @@
 -----BEGIN CERTIFICATE-----
-MIID2DCCAsCgAwIBAgIUY5+/5fre7Yye9bdcLkaX4rfuwOwwDQYJKoZIhvcNAQEL
-BQAwVDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMRcwFQYDVQQDEw5JbnRlcm1lZGlhdGVDQTAeFw0yMDAx
-MjExMDAxMDBaFw0yMDEyMTkxODAxMDBaMFYxCzAJBgNVBAYTAkNaMQ8wDQYDVQQH
-EwZQcmFndWUxGzAZBgNVBAoTEkpha3ViIFNjaG9seiwgSW5jLjEZMBcGA1UEAxMQ
-a2Fma2Euc3RyaW16aS5pbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AMupY44JPL6voWsMIBlD4TxKLTiD7WGPl20ez7VJgkpaVqtk3liCzuu6d7DjwQxC
-GjCsewa26mwJ1FJJOEC2MpQ4qgqGUTEWIXL3h27muB43qomsYYDnKTQVwySmR54i
-EIYHQZBqE7sJUo4cxZc9AsQ1vp2eMLnLDQ3fMNcg3jiFRk67LDx90SwdgiWkqTi5
-e786oO4y/1bOg0fdCvDyHqt/+LRMXuD3s9iXgHeAE3Y59Jpgijv8ZakDV4F9fp9W
-WTVh4Oz8whO1ouhkCaBGWA50oW+kPKSwPjyj8DrIqUMkQ16/nzqCfY5nt/Q3HeL4
-qlPbkHsD7Kgl1XiqvV0ErY0CAwEAAaOBnzCBnDAOBgNVHQ8BAf8EBAMCBaAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0O
-BBYEFNiIRl+fB0U+BmK6ZgVKY5ioAF7AMB8GA1UdIwQYMBaAFLVhFP0/k00g4+YT
-lL3FKgo6VsypMB0GA1UdEQQWMBSCEiouMTI3LjAuMC4xLm5pcC5pbzANBgkqhkiG
-9w0BAQsFAAOCAQEAQ4KCh93Oc80QkQmN5/hw8D1ru/m7apQOMeYFu/wQzTylyxJv
-FBdlxgdtfMZxFth3yhv7Gd+ftMlknJjYlB68eHXdlhm8pY9Ip1Y7Ks5uprq/Jy3p
-MBaCIfWCoRGsqrXtEYLewbRvh6zOGAAPrBxPDOSZt0GKd3Ivn9N7fv9MVF04LjqE
-Fx3EE6WMb+lezy/uaVuCN1UAFwwk3pHWOHfXIMze9xWd6mAIDdjGfCm0dVoYjdN8
-kgpHNFDyJv55SSuQ10LhxvAVp66Pb4hFfdAT/ItE25xGAUeupJubEpqGqPEZZG5r
-UmE8fUa+fs/tkDyFsWP58hgXxvr1e5rG+zn4kg==
+MIIDyTCCArGgAwIBAgIUDkvI3Wv5CRh0RzB8MXkv41NBEscwDQYJKoZIhvcNAQEL
+BQAwUDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEeMBwGA1UEAxMVU3RyaW16aUludGVybWVkaWF0ZUNBMB4XDTIwMTIyNDIy
+NTAwMFoXDTMwMTIyMjIyNTAwMFowSzELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlBy
+YWd1ZTEQMA4GA1UEChMHU3RyaW16aTEZMBcGA1UEAxMQa2Fma2Euc3RyaW16aS5p
+bzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN84TIWPDSzp1/pD68Gz
+6FmZznCMBvx7UTFzRY1fLWwR8y/HP+RynVaIZPujc8fLnBNcQUmHj7LM2ZI1pJoD
+hN4d+VT9QqXhxpN4JS8XgUtTb213Bt7ZzoI83ittiLGQlyodu45qjzoOuue74UoY
+i6wqF7t3EqsQvNjGSCf1YjDZeSC42G5K9g3z7lwe2+X+0waMqZgBgXJv/kjYt/q5
+TD+HGUSa4Y31WLSsP7EXyNYv271X6kSh6WAVuEt1gU7lHAfrUqrqtFvn88MfUI6N
+Ij0z2Y8jjg9y2kqX2EKeKaYBPPVCchPcOp44qZqw43ky5/IZ3FNXv+t+FpW6Np+I
+zIMCAwEAAaOBnzCBnDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFGseVQtXR7MOOb82
+/qh8uEGvSza7MB8GA1UdIwQYMBaAFB3GIzYx52BDTZhONk4XvvrKINm+MB0GA1Ud
+EQQWMBSCEiouMTI3LjAuMC4xLm5pcC5pbzANBgkqhkiG9w0BAQsFAAOCAQEAoGKP
+Zlj937wEx4ldGyOADow+et8UCOIGpv1bJ34FDmcwcNCj5XhE3YHjYeKMz8vXFsZA
+u2qCNeP+RICTjI9P1XCphtk0h6tHwRZn+1wcQXYf9wsZzaPiDb06KsZCKrlF3Hfm
+Q9DtAgdMY3v47veTeIL5qhogz3JQTMzOcZWIvSa6zmBVklr4kGpg8C/F+T6eM77y
+BUV/pWfvFUoJD5DjgSkKjcABDyG8IaiLlW9STFwgJTIJRRuilJjN0+hlgXEF5dW6
+niwqr64IhUFAScYIzbMoiIOhs3HaoH2BWHTFns11rmFUAQPK7P6zgiUgdnQcXHgP
+IYg7nFwfS1kJ29ZhCw==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIDkTCCAnmgAwIBAgIURcQMUIuoPPkw2T1wQ30S+f5Rf+gwDQYJKoZIhvcNAQEL
-BQAwTDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMQ8wDQYDVQQDEwZSb290Q0EwHhcNMjAwMTIxMTAwMTAw
-WhcNMjkwMzA3MTgwMTAwWjBUMQswCQYDVQQGEwJDWjEPMA0GA1UEBxMGUHJhZ3Vl
-MRswGQYDVQQKExJKYWt1YiBTY2hvbHosIEluYy4xFzAVBgNVBAMTDkludGVybWVk
-aWF0ZUNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp9b+TCOGhBgb
-wO7d+Npw9O5TObEbTQFWAU1XMupB1VhScv+xs9z64/uViPS/gYJ1QmLJoaa1CM0B
-vg3wUoPYPWnWUzz6GTuMhldBuCzuIuASKjbXxkxrQBdZIP/ojqVto739QMaLtzRq
-2pZUuTM7mGMCQRP7faEZ4d7JLu5bF0EAKyw/BRf+vs/nYReYSr5D6p79UPbsHiq7
-O+YNAaY8rpkMGq9CQRQGxa5xVKPvnTLp+SYzzaDNZUroNn6KO/wFythod9qGAFON
-uBcOkLSIZNMKPX2nwwCeqDdq6vCYsaXS7TI/JgYdBRWNeEbi/vfMtPib6eijWLfU
-3DK0QNKx2QIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQUtWEU/T+TTSDj5hOUvcUqCjpWzKkwHwYDVR0jBBgwFoAUaHrh
-e9+8hu9fAPZuOUh/jV2/CBQwDQYJKoZIhvcNAQELBQADggEBANlQ/k1qQEiruB4c
-b8OYbtUguvaWcYJOuVuBGjgLYdgY3uZxZ7CWXtSLLL6cCuJ2iT1V5MWga5AtUh6P
-+8LsuKIMPXmg263wSbeqVRY0RFMJYJ29oWxukd5tSxEYjrjbHpcPluHrI0/RiqzK
-Ewwh+oi+sA1Gye1DeDOYjE2kdIpka3xfManrmJ0LfQ3e85qkVFTeqWJ5u2D0EEFQ
-l2sIg7NQlci30LixHxx8o2ABq7t4Bi3UBZ4YfMFsu46Uus5Iu4TDsEq0V9VhTLzG
-TLzwuznfAz23rBB8BM+r94NQ9TMof8GJBVIUj6aMQ2D3aI/EOBetpk5qiNEI74Vk
-aT8r1Zk=
+MIIDiTCCAnGgAwIBAgIUO6nl6uydnFw1TUOrainPL1W8+uAwDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEWMBQGA1UEAxMNU3RyaW16aVJvb3RDQTAeFw0yMDEyMjQyMjUwMDBaFw0z
+MDEyMjIyMjUwMDBaMFAxCzAJBgNVBAYTAkNaMQ8wDQYDVQQHEwZQcmFndWUxEDAO
+BgNVBAoTB1N0cmltemkxHjAcBgNVBAMTFVN0cmltemlJbnRlcm1lZGlhdGVDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMtgqe5wXO3ZlRmHv4p4z+nG
+xPt6sgdxJxoxWHuNWHYnRomJmoa+bYPWB5kijZ4MUBH2jV2uVq+lZdaJxf+RBpSQ
+Xi/lLtOpQmI3O4GcnDYEu/rTnIQTl1XoDlrB88tQqdkFPAANkafguPwNYiFSEkn/
+XLmC2A2ontuWo6WPpIMFzbra5NSA/PTN+g7bq+X2q7yuKI0TFyRcc0lEXfnpe0j5
+xaeF0oX2NxBCi4d9oGh9ZJX6cEhIkF/Ff1RPCvIpENZOQ1SGI8T6xZCVSGiL178/
+8/gRXE7hWRwRfL7QGo3RIwe8U8NEjysKdZZaHVPEErZhR/FMQxxvioWu5YLFAbsC
+AwEAAaNjMGEwDgYDVR0PAQH/BAQDAgIEMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFB3GIzYx52BDTZhONk4XvvrKINm+MB8GA1UdIwQYMBaAFL5HYvT/4o/gRvic
+DCz+A22/8wZsMA0GCSqGSIb3DQEBCwUAA4IBAQC1WvbMuCtNfHQ0D7e4Ht60eE3K
+LdQ4xPKWndt3o9pk/8MsWpi55SqKP8xGmLOxwysDLEgc5m31qnDYI1FV5c+sBKWr
+oAXK8MIfsnYaaGB8BNk1dspZpst7kOxLeoAsHkZb9DMAirrrSDFmPeMweO0kzUHE
+dDHarN0iiGAB7+oNYt/V2YCDlOTBlAGQ4gwL6enXIXzfTIOBqjIE1uOzbF2RbZLp
+Lhj6n7CzmH979Pr+IzgOUbMuEcRNH8rO7PvJf6MIJp/D436wPUZpnP+xZP/emELW
+pWxbBUsQwIttHM9gcitVd2q7PVdKYB5+ETpXWlC3WQdGqhC8H0AnPL74jPkR
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIDaDCCAlCgAwIBAgIUfwjp9G2vi3tYh1DIf0Xcn3BK40MwDQYJKoZIhvcNAQEL
-BQAwTDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMQ8wDQYDVQQDEwZSb290Q0EwHhcNMjAwMTIxMTAwMTAw
-WhcNMjUwMTE5MTAwMTAwWjBMMQswCQYDVQQGEwJDWjEPMA0GA1UEBxMGUHJhZ3Vl
-MRswGQYDVQQKExJKYWt1YiBTY2hvbHosIEluYy4xDzANBgNVBAMTBlJvb3RDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOCXYKPUJ0kobSQzQMmK/iOA
-a37jRS4aJcvO9g5r5QQZzfO1/X9YAzeI/bG66bcgvKYI4MBZDYoDRpuER7Q/FFZf
-4TV/pF4TL6XrlOFBclT4/HOF2SxozR6QhbajHjnTdRirH9Yhbq6G66B+Gcz4reGK
-ggwcECkO34M3BsK+QH062+XBmU6HGwCdh2SNOfe46nh47UBEcOkQSepLszsLj7pR
-DrcrX/V7q6oO7m2jCoDJ84NmBM7DFoDXcsGpHZBNhuxMlfsMwqvBU1dG850hUVND
-uaya8dAh3we2Wd6EHXEMlpZb0BcsHasHDl3WMm/OHKdEXlts9lQmkjz+1p1iXOsC
-AwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
-BBYEFGh64XvfvIbvXwD2bjlIf41dvwgUMA0GCSqGSIb3DQEBCwUAA4IBAQBJCQp7
-lXS/Zkzqg9h+SFiZZD4yD4J8tjol/TubDA18q66vQl+sOqxyvrBZcx9oBNLMbjei
-AZIJfQF68Wek+lZp61mvgTG4o9syus43SEg2nzN2rMYvQVx5qtpSx5YmQhdVmsqJ
-azoAlqFoMQXGXJ2YZo8y/M06Q9F3A6BWksAEZfbBaqCswseUn44JstQFhIpbC50I
-+6zx9gp6riE0FXzNlq2Gi06yixRiDw9oZB2/+CTW2zFHKyX2DFhey7EL92ESSrpm
-PUG3pPD1l+j86EyJjAEB1u4TlWH7PTbV8nuNbCXut1WI+IrplSgwEtXz8i0YcYty
-S1vO689r9LDTVB+V
+MIIDYDCCAkigAwIBAgIUT98LRnK52FTHAIt0KmA43bkwSYkwDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEWMBQGA1UEAxMNU3RyaW16aVJvb3RDQTAeFw0yMDEyMjQyMjUwMDBaFw0y
+NTEyMjMyMjUwMDBaMEgxCzAJBgNVBAYTAkNaMQ8wDQYDVQQHEwZQcmFndWUxEDAO
+BgNVBAoTB1N0cmltemkxFjAUBgNVBAMTDVN0cmltemlSb290Q0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVaVPSw5348JYOqA65LudkzG3FxUvq2pLJ
+DUPLHsA/IGdtTHARyXcq3QL1TZ/1pR+Wg4Faj3Jd8GbEbi9dtL2qYPR7a80IFtdG
+uqlyw46Hf+zZV4CSVkKeqA7HshbNWpkP416FfR+3PLOIvMQAxrbn7GZfyJfdgPgx
+9mAn/jwhwGyTd9qU9SexAztepZ+YsBd+wpguFRpjF+iRy29didXWpxih/y55FC+m
+Q+PDCw1Hzlbhydt+7mYLaukEo8EWrbv1Ad6fNBITYeeCpdfF9P+BEe4X6oI7gL6C
+YMeNkf2GsceDjejUwy8QrHAtw4Kzs0fSHWbec9UXq8lXOAIRR+ofAgMBAAGjQjBA
+MA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS+R2L0
+/+KP4Eb4nAws/gNtv/MGbDANBgkqhkiG9w0BAQsFAAOCAQEAXqA6GCH8XxVOlWUg
+lo8kdLeGN4qdq2/nNEuPDe+MYxzuGxYS1ECatuzs9cGOBvpSsAw8z1iNJvf1Ea6l
+ijLDVoiTzCA6OxlPINzfbg0jafMDn2CvdCMH4ZHr6W+J0L4dzYwk8cWnUE7HKiMp
+gcg8NoQ7T9Sm6FaG77Zzct5WQ/HlKQlpJt40pIw4hRF2KyqgoSYkN2CJHHO047KN
+mpl2S0P9J3au03m63uAOM88GiRGQsguQnsBE4+hYhopqAwDYWSxjFYkKueKOo9bO
+f+xwwjvm0N+p0+TTPW6JH3TQykowKKnAnNkWviAbZmtR3z1H0A9YXnNPxbefMFFI
+wPKoPg==
 -----END CERTIFICATE-----
diff --git a/systemtest/src/test/resources/custom-certs/ver1/chain/strimzi-key.pem b/systemtest/src/test/resources/custom-certs/ver1/chain/strimzi-key.pem
index 6c7454e4b5d..078fbc3dcd7 100644
--- a/systemtest/src/test/resources/custom-certs/ver1/chain/strimzi-key.pem
+++ b/systemtest/src/test/resources/custom-certs/ver1/chain/strimzi-key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/systemtest/src/test/resources/custom-certs/ver1/clients/clients.key b/systemtest/src/test/resources/custom-certs/ver1/clients/clients.key
index d5bcb47c1ee..0bb5281387f 100644
--- a/systemtest/src/test/resources/custom-certs/ver1/clients/clients.key
+++ b/systemtest/src/test/resources/custom-certs/ver1/clients/clients.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCyeqgNQZc1grgK
-dAP06k4RJXq90TvXfj7872uMZDL/gp5iO3r8Jvb7ah9BtAohHYjovH61MDITJqMj
-qgao/Z12BzW/w25TYH+pWIBqa1Pv2hpsiUVae39ItASy/kBxRbrq/++NQl6l6v6M
-WKu+yBMwn8pkl3B2otE2adkiwdo2WT7QRcjrN4VChiqPwtBRm/R15Bbfi02gx/lG
-Uu6ECJO8UU6ePbf4F2sq1j576xqd9vujuDMFz9ql59caKB9AJ6KKjOm4Dx0OT0tg
-r0vmnR3F52CHq2k2xAIDacnM3r5a4Sf3v6dxlYP3bSe1Hy+Mpu40XtH/KUwCy9Kn
-mAI6yRJZAgMBAAECggEAIap1TJrUtOlFYeNkY6xWsXFKZ8ex7AIKS5e1x7OW0w+G
-ZK0nk6yd5eqsnq4hQwHZM11q4S6II4ikOTP3MaU1MHBHuTZZ9yw6qGzjPC+mk5Wm
-alayWFD3P3WFdWX0LemjSnSgcRrV06IyBbMsIj6HMCLUAIl4U0h/Ai6RILdEO//k
-ebNeEOy2m0KdfvUf4vD2P/r28yLWk93m4MT8b+1XxEnMEjAAkU4hcja//vguW0BQ
-Brml4bVFl2sHenX8exGxnBpz0MPiuTmZ4MOjmKdBiCeOW+78balJn8FiuizoSKpx
-vRY3+PmVt0TAi1kAq1p6t7N8z4gGmywMA6SmjjPOIQKBgQDAHbdDGv9pFdaJ/5uI
-AFwVanTQ3xI6IHRboG1/Z2u6PDTVN9v0ezTGd/JFXDmkDBbp8xSM2mL3ZRRGNHS4
-BMlV65QIJ09LPVMtCLQrF8xoKrdS2w2Q/bL1PAGxHEqGzSAmhYQb5f0zW9d8oCE8
-aaetJFwum1zS98jwInTIFScgDQKBgQDt1BEIhSetV7F5rmAMTWvqH/5vALnROBXD
-slL/w2eNTOMamJ6XBSI0CWg2zMWwUTWHILiX+hLR1/yM7oikIoOvXSitpPeT6n27
-TraocXwMeGqGIE76i15Za7AcbSjFaqiPpC7EQx+8JpI8ClDTR4tzNxABYsmSHfeD
-D0qxk6EcfQKBgDklHawCTdLOQiCOPY84vCtKnTC8CcnseW//ylJJSwv8eKKrmOuh
-8lLOvuvOwP6A8hfozEYRd7qrAFrZo5ZRJio+hqveNYHl3eXZXu4qiAy8GAe3TNPC
-AwdbMA2koq5yOYv7zw4VXTl3qiNR5lD4BH5GAH2EjRnbxpNXTHFviVHJAoGAfaiV
-012faCw0Xmlu4DEr+okrAvVsOIocncijp/VTykm8mLnY2UxiFQJ/aKzrKszNrnbw
-cYQ022D2VHRYB/kggNCFBLJsCWBVTFk7k2Zat7AMAJAjiqeGk1Kdu3dFmoFPTI3g
-E9yvcNckXsrIh8l+ecK3FzRd8nEY7MtwmMC62HUCgYB+mFNEcpt3hSm0zvf4ql+1
-KHZ+qLd8yi7QdFIuANVArX1FeSyj8rBgfbZ4Z7Qxi8u2lohjDb2q5S/q4WtgFQUd
-yGN24lMcEG9KxjljaXVuVf1oALQiGPE+TybVU01jwsRSq2vRvagdjKyabweuCYcn
-cPs4eU1W38ugXEb4JQHlIw==
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC+BBxojPio9rY2
+kM6uA6DJZLd/GGnu8nSqzlhUd8WLbW45TC16/KZd6R2t7Ql+MoViR7G4lyDcJvWb
+rBqIDP61KnTssl8UVtjaihBJbKia4YUD5qhSmtdNU4InG/E/OL1XbUpUnbCQYa+C
+PdO5Hc5kqyP3X8er44rqgbeHeu/0HLrg2THWdJnzHYDgmzPHByMIiju5ZJxT+cLy
+eR/wm9o4Z83yzO15SMfSfvICA7W4KOa7aeEIguIYPgR8rtIhnsBF4wGKdXnOkk1c
+s+tJb1RvqqxFHiiMlzWUaMj7XGGtetrWC2SSk9pGrnosNrKjdGDJg7q3fCb9RkCV
+VvKzCSMDAgMBAAECggEBAJuMX/kSVchzVgxrFFYNMEVNBo2rXaS2o9zjWBmlhngx
+18Zd3ulMA6Di4WHsphXBo8ElcY3rYYH2/p42D+4JvURvAhJ1njHXOmQEG3sP0SIg
+tTPRUT919AQf9W6wiBe6Cf2UwQFtqQk4fmU+2aAzjy6HjsTFin3iomiAUc49TErn
+BM/HliQPjyTKWpAwXZ0xVjBdcG9eLJtW4iWkqW5/2aFse3tWOJN7GqTmsc3eo422
+o0IJsTSqF+ehTTE8HaXJ68yk3zQDVwmKzawlUp+IP71hggdCz7ENobaeNyS06VaN
+/Y4O2u9tgT9+AW4w4Itp3smoQU8UOEmHzTiTFyIPyQkCgYEA2dOQinY6mDaaKLiW
+78rnkb8KFt651xKqLbdAV10R/oqoScACIGjsy9gcFXanYb13fdkyrKO7QftNROL4
+JQCj5WSWYvkrxTf93UB8Tzdel19VdkwI0ntoIBwWBKs5bKUEEoVgT4kaYpmSBEXs
+9mVMmD0rDz4DS/SIMwNZw8npPz8CgYEA31Dg7PzrD9XTKiT6NmC+3u4HGsIPnLir
+VPtcv3Tr7ABnaT+WMVzmWuhKQUTJ/ZSE7DkZm+uF8vO7BPDpRFsWcA6L8jUawYBK
+rgsIvhgJFBypcdhnABI3xQMhGUi5ys0AZkFZV43P8pUWxKlHltwFsWhPUnXmebXo
+trVLMraHrz0CgYEAx6waxAHKhnsO5yMGIPuDOGPBcONrwU33t35SuYK0GvupdilP
+CbyEy/rnC3m/x2WxYig2PnC8F6iv1OSliO3ET2PcQw+bYuaHjEgva0IbMHEQWycp
+sx+yfDSirlbyhbfiOsQOW/oWuKmDYu1iYR7MjoULsqYqyXZ3XyPEJigw6msCgYEA
+ucaW15AwHKRNXyoT3VjucJaj4ma+hio6nh/eMIgcG+DaJnx3felC2S2VWGbZgtMj
+IUD/RO7SKCMK2jlwVSVRrTbsxTnYYFFRzyfuxfVI2Cpf7A2S4kRFkOfhiR8vML8K
+Lgb/RA79h1jv7/rDS4UOV1/nXTon2eizCAwZ2r5uciECgYAaD6iqHNwnSmxDLQYZ
+0BB9QjTWHSby/dRDc0UPe3WhRdfAzYf4il8Q391aTC0TbvFyM7p1i7cInGFYw3c3
+MrlkZjBQJAenq2GzijBr+IjbuVkRFMrkUXHaYo2zXCUyZghuNQN+nbvV36NuRUFF
+pmcMi3k+dZpWIaohDCFgLcIjeA==
 -----END PRIVATE KEY-----
diff --git a/systemtest/src/test/resources/custom-certs/ver1/clients/clients.pem b/systemtest/src/test/resources/custom-certs/ver1/clients/clients.pem
index 730d0c0bef1..69d21bb0a62 100644
--- a/systemtest/src/test/resources/custom-certs/ver1/clients/clients.pem
+++ b/systemtest/src/test/resources/custom-certs/ver1/clients/clients.pem
@@ -1,22 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDlDCCAnygAwIBAgIUXd7HCZ9lxOomoklWhy+rPQHW9a8wDQYJKoZIhvcNAQEL
-BQAwVDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMRcwFQYDVQQDEw5JbnRlcm1lZGlhdGVDQTAeFw0yMDAx
-MjExMDAxMDBaFw0yOTAzMDcxODAxMDBaME8xCzAJBgNVBAYTAkNaMQ8wDQYDVQQH
-EwZQcmFndWUxGzAZBgNVBAoTEkpha3ViIFNjaG9seiwgSW5jLjESMBAGA1UEAxMJ
-Q2xpZW50c0NBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsnqoDUGX
-NYK4CnQD9OpOESV6vdE7134+/O9rjGQy/4KeYjt6/Cb2+2ofQbQKIR2I6Lx+tTAy
-EyajI6oGqP2ddgc1v8NuU2B/qViAamtT79oabIlFWnt/SLQEsv5AcUW66v/vjUJe
-per+jFirvsgTMJ/KZJdwdqLRNmnZIsHaNlk+0EXI6zeFQoYqj8LQUZv0deQW34tN
-oMf5RlLuhAiTvFFOnj23+BdrKtY+e+sanfb7o7gzBc/apefXGigfQCeiiozpuA8d
-Dk9LYK9L5p0dxedgh6tpNsQCA2nJzN6+WuEn97+ncZWD920ntR8vjKbuNF7R/ylM
-AsvSp5gCOskSWQIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUWxMyRmFcWjgmhYdfkODvJ8mHITcwHwYDVR0jBBgwFoAU
-tWEU/T+TTSDj5hOUvcUqCjpWzKkwDQYJKoZIhvcNAQELBQADggEBAJYQrbaP+MVP
-M+pSToL8TwsZmf8f0EjUBKa5C96nvepMFxR2YW0R+yI+JwbzobWhZJL3RqQKBYlQ
-XmwyM6FFV+gLqVEUstGvhopk5dWv0378/kIUJV0J7yEgCXEBjUSiKiIcJveDPlvZ
-SFBOgrzVQIqckUhqitXdMP8BdjFvSbeOpZELyAis8wFDM8BI65LWW1DAepxuhbku
-PgutpPFnJi2DFvGEw3XOuXY6BKjM9CXGf9AQrxLXhcOBVIVgr00NqPSyzT8HzlJt
-OjCrw2XzObQ47lLf6yULE2eEE8f6XufEmjbKl38ruyIk7IMw1KmWfeG057YqQ2St
-1rCJMy02LUI=
+MIIDjDCCAnSgAwIBAgIUTW3j8gazwDZL1xhfZ/zrodg7faowDQYJKoZIhvcNAQEL
+BQAwUDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEeMBwGA1UEAxMVU3RyaW16aUludGVybWVkaWF0ZUNBMB4XDTIwMTIyNDIy
+NTAwMFoXDTMwMTIyMjIyNTAwMFowSzELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlBy
+YWd1ZTEQMA4GA1UEChMHU3RyaW16aTEZMBcGA1UEAxMQU3RyaW16aUNsaWVudHND
+QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL4EHGiM+Kj2tjaQzq4D
+oMlkt38Yae7ydKrOWFR3xYttbjlMLXr8pl3pHa3tCX4yhWJHsbiXINwm9ZusGogM
+/rUqdOyyXxRW2NqKEElsqJrhhQPmqFKa101Tgicb8T84vVdtSlSdsJBhr4I907kd
+zmSrI/dfx6vjiuqBt4d67/QcuuDZMdZ0mfMdgOCbM8cHIwiKO7lknFP5wvJ5H/Cb
+2jhnzfLM7XlIx9J+8gIDtbgo5rtp4QiC4hg+BHyu0iGewEXjAYp1ec6STVyz60lv
+VG+qrEUeKIyXNZRoyPtcYa162tYLZJKT2kaueiw2sqN0YMmDurd8Jv1GQJVW8rMJ
+IwMCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgIEMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFPiL7BeYsf6RUonphbchHb23c8AvMB8GA1UdIwQYMBaAFB3GIzYx52BD
+TZhONk4XvvrKINm+MA0GCSqGSIb3DQEBCwUAA4IBAQAM7g9uzun9U2jZ8R/Xe+hA
+36ceciICHKCsNY6/1FOaaqYvtVnbrmJwsO2Mh3lbGwzlJjvWtHvaaZDFMkDlcFrj
+SKWtAmO/1RE0PYtCwkzxjEt47D8WhnswlJcUR9SJ9tYNTCNPxYdB8QsPihrAWtNS
+tGCs6nmm3yuflt4i0Sl3f1YLYU2YBBIPNg3YI96vqljpxIzT+lWY8gQBGhKhX3DD
+HvH1pIjIYizzmK8aRG4tKJ3XOtY4LHtCL05yfSjDbkHmP8LMKtFQokMGr0xfAwv1
+JW0VnkF7+W8Pybh3OJqP+9V/2HOAI+EqSTwXxLKt7oIZa6aqKB4oDm5/khe1o+KV
 -----END CERTIFICATE-----
diff --git a/systemtest/src/test/resources/custom-certs/ver1/intermediate/intermediate-key.pem b/systemtest/src/test/resources/custom-certs/ver1/intermediate/intermediate-key.pem
index f17513d0fcd..01b9295217b 100644
--- a/systemtest/src/test/resources/custom-certs/ver1/intermediate/intermediate-key.pem
+++ b/systemtest/src/test/resources/custom-certs/ver1/intermediate/intermediate-key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/systemtest/src/test/resources/custom-certs/ver1/intermediate/intermediate.key b/systemtest/src/test/resources/custom-certs/ver1/intermediate/intermediate.key
index 6e9ae9349e9..7d7b01802a0 100644
--- a/systemtest/src/test/resources/custom-certs/ver1/intermediate/intermediate.key
+++ b/systemtest/src/test/resources/custom-certs/ver1/intermediate/intermediate.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCn1v5MI4aEGBvA
-7t342nD07lM5sRtNAVYBTVcy6kHVWFJy/7Gz3Prj+5WI9L+BgnVCYsmhprUIzQG+
-DfBSg9g9adZTPPoZO4yGV0G4LO4i4BIqNtfGTGtAF1kg/+iOpW2jvf1Axou3NGra
-llS5MzuYYwJBE/t9oRnh3sku7lsXQQArLD8FF/6+z+dhF5hKvkPqnv1Q9uweKrs7
-5g0BpjyumQwar0JBFAbFrnFUo++dMun5JjPNoM1lSug2foo7/AXK2Gh32oYAU424
-Fw6QtIhk0wo9fafDAJ6oN2rq8JixpdLtMj8mBh0FFY14RuL+98y0+Jvp6KNYt9Tc
-MrRA0rHZAgMBAAECggEAI6I3lz6rnnvn2IxeQClQdg/rR4Jcg3rXIauj6cFmfL8l
-shirR76Q3bpaQxuDVSG3d4K1wEY+hUHRLuKStVIcpN1FjaKSjqzf5t27rDiNzoW4
-FZJTOVycIJ1UZPcwDqj8oBkEHa6JlznfvczQ7Aj+jBnpLpvpdwCvGA9Os1ITsNnZ
-7anYmw9fzOtYtJ+2k09D9fW9/S7Sh8RWIQaZRTpbkP5b/Z7gfUa5UiivR3kT50W/
-Qo9EQAR2O5AzCLCfuCTijwAULAcByAPxe7wgRWdxKZMqm8LKA25XYE0djapy2M/2
-pPNUkc4wyGpkJeK6ovc6wKlICJFGwugc5Mn/M+ELAQKBgQDGGafAmPZ/jUB5N5DC
-Vl0TT661TTKYGWCh53tO7Y852RROwRVQUvwLS46UmRzQ3zzcUuCmkDJbhr5cXu54
-BKxBfmq8Am+0hJRXqfODy3NMB49Gz39oKjDmsPEEFNuxq7tda1HVcy5albKrO/3/
-CWPQGh+WhZY8fMU39N0dJlJ6qQKBgQDY5S5FvNP8TLIZtmqgeBSqH+4cd16gEXf4
-Ci7eGHBXOPvC6COHXJxnyuUR+b7qoWA9s4u/E7Cji6Loe1FcWU0kKHcuwa09wnCe
-+IJVDgul9E/wov4a+rkSxS9CPsU5+muN9fkc4aKc9tDvQbbxLNmvsz5sD0JCktCn
-CwxdChWrsQKBgGHg+Ta7HUgGha2e28J5o4FQJJVl8DKgj1NPqWhlDhhZ/qOu2RYX
-+nqmOWuIf2lgc5S0ylTh+E+qstG3AgKA5I9zo88DMSgzPYxW53/d/Ti6n3swONZB
-ymmhUWRf3fDaVjghN4zMXUHapy3d9XCWth9zWNopZQK770HnlXy6m5QJAoGBAMW0
-EfurZafC2U0qxALFskBonokAHhbWFX7Y+WOk7zHyVTqSk2AdgMvzW96IwgfpVWqo
-sKdZcVeCPtqfHciJ9hEReaH7FMkI5dNiPpr9FI0PJ5b3W5yIEg8UAkHmKazxoPxj
-y9ERs0JUkJqmUfWApmTLhAjH1+QLI3pATeK5AIvhAoGAOIxuyrTphhtSxfFK4x+f
-2QRGWSkqL+fC5pUXAt0edN0oTl26yusNqwjuEEEF6acv5uchtVGlh+Qzb2RAXl0M
-rlyJOMQpAJkXKyoh5KnY4EUJO9aQUAh3tmI3ts0akGKkWb0CpTAFbdwPb/oeud0a
-VfH+rFD7RcoAZWVtP0UnSz8=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDLYKnucFzt2ZUZ
+h7+KeM/pxsT7erIHcScaMVh7jVh2J0aJiZqGvm2D1geZIo2eDFAR9o1drlavpWXW
+icX/kQaUkF4v5S7TqUJiNzuBnJw2BLv605yEE5dV6A5awfPLUKnZBTwADZGn4Lj8
+DWIhUhJJ/1y5gtgNqJ7blqOlj6SDBc262uTUgPz0zfoO26vl9qu8riiNExckXHNJ
+RF356XtI+cWnhdKF9jcQQouHfaBofWSV+nBISJBfxX9UTwryKRDWTkNUhiPE+sWQ
+lUhoi9e/P/P4EVxO4VkcEXy+0BqN0SMHvFPDRI8rCnWWWh1TxBK2YUfxTEMcb4qF
+ruWCxQG7AgMBAAECggEAVbCjyLgFH54miTw+Av0GNSyvwHmg2yvc2tdhvaT/WcEQ
+olCdEBraD8s1Jlt9qdLsRbVJOOiE07rvnqYsC5MyX5Q4axu4UCwnsTQuWV0AIG58
+OaHBd5C9mc+NhMXlj4usFKl071zIOyCfMGv/JaTr2cvDaNJtb8vVKxZcWxybpywg
+g4QLFnKn3LQ2s+RZnFaNqL7eJPTRr8SnBLYuXZqs8LYr0dvbMMKJZYRw8zGJZlcB
+475hMHRjbSi7LC4yw5HONqeE1TyzS23ejYs8DZRfOX14VhEuVUOvxWZPllkgMwEm
++F0s8XPvA24z4GXam6/Yrdb1ivtrfEUGslqAgSZneQKBgQDNuf6nt7y9Aw41SWrH
+tseGismjlrxCCLZnVqjOJVkxauy/QzwYTzlFYWLgr68DCUyaArMgsziSKtWY/Av9
+dstEHBPj/y/M07wND+cEwQCD1xnzSOEGiUX91KJ2rQHU52uyHJeNRkUq8NgDhdV0
+h0KL7q7wc5e/sj2BSgzTOQg+dQKBgQD9E7i8BxpIIJXg5gJummk1pexttlUjoL1p
+W95i7tGWoK0E1X1nSc+fqX9+t2jjS3oHsSgPGEKffT159Vii1JztjUHEIT90MO9q
+slaQfCSNI1GbFBlK/FCYTMhENPkp9ND8IIPy01ursa387d//RhAjiXa8J/LiXwmm
+5FhGj6aZbwKBgGH4k2d3vrAchmWmAu39A2P1MDVxkVG5KHRp9pXFf4ZjLz+eWz4Q
+bGu4BwiNYcEGaq5lXrzR3LzvHS1vyp34NrDG1kobur3Gj6WAzzmaWA5xH3CWYmNk
+eCp7Wqs9lMO5ObZmm12x+zqJ27VBxPdreqt9DV6BDeFClru9cgIdBOoJAoGAAPYn
+OIeqYOXGzADzt2ncxnhn6o7LygPdVF4l/Sg9IZ5gqekJve+42zlwo5Gc02hBAXB5
+33zPG/4E0sbM3GmEYx6rRkx+Cjn5XuVokMn39ZVRxQ4Rfohw4fNAu4mb/L3SYXLa
+LX0CFyfoqlJZDIY+n3PxQIvCT3ve9IRflX0MO/8CgYBAeO8eagUSn/XDQBK+R7zl
+QMc+d/xvhtDibQJbPQjQkUils/tW2UyV1uCvL1DZrm2jwYzyMFHbadhLnWzKzMzh
+CgFdnxlZWcsibaRiM8CE1y3rE+gTYphU96BxWjR+VGwdqSJD+b9oHPyj+6xUhjax
+ksRHdlEFXDKXT9noslhlaQ==
 -----END PRIVATE KEY-----
diff --git a/systemtest/src/test/resources/custom-certs/ver1/intermediate/intermediate.pem b/systemtest/src/test/resources/custom-certs/ver1/intermediate/intermediate.pem
index abd12765d9f..ebc1309341b 100644
--- a/systemtest/src/test/resources/custom-certs/ver1/intermediate/intermediate.pem
+++ b/systemtest/src/test/resources/custom-certs/ver1/intermediate/intermediate.pem
@@ -1,22 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDkTCCAnmgAwIBAgIURcQMUIuoPPkw2T1wQ30S+f5Rf+gwDQYJKoZIhvcNAQEL
-BQAwTDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMQ8wDQYDVQQDEwZSb290Q0EwHhcNMjAwMTIxMTAwMTAw
-WhcNMjkwMzA3MTgwMTAwWjBUMQswCQYDVQQGEwJDWjEPMA0GA1UEBxMGUHJhZ3Vl
-MRswGQYDVQQKExJKYWt1YiBTY2hvbHosIEluYy4xFzAVBgNVBAMTDkludGVybWVk
-aWF0ZUNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp9b+TCOGhBgb
-wO7d+Npw9O5TObEbTQFWAU1XMupB1VhScv+xs9z64/uViPS/gYJ1QmLJoaa1CM0B
-vg3wUoPYPWnWUzz6GTuMhldBuCzuIuASKjbXxkxrQBdZIP/ojqVto739QMaLtzRq
-2pZUuTM7mGMCQRP7faEZ4d7JLu5bF0EAKyw/BRf+vs/nYReYSr5D6p79UPbsHiq7
-O+YNAaY8rpkMGq9CQRQGxa5xVKPvnTLp+SYzzaDNZUroNn6KO/wFythod9qGAFON
-uBcOkLSIZNMKPX2nwwCeqDdq6vCYsaXS7TI/JgYdBRWNeEbi/vfMtPib6eijWLfU
-3DK0QNKx2QIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQUtWEU/T+TTSDj5hOUvcUqCjpWzKkwHwYDVR0jBBgwFoAUaHrh
-e9+8hu9fAPZuOUh/jV2/CBQwDQYJKoZIhvcNAQELBQADggEBANlQ/k1qQEiruB4c
-b8OYbtUguvaWcYJOuVuBGjgLYdgY3uZxZ7CWXtSLLL6cCuJ2iT1V5MWga5AtUh6P
-+8LsuKIMPXmg263wSbeqVRY0RFMJYJ29oWxukd5tSxEYjrjbHpcPluHrI0/RiqzK
-Ewwh+oi+sA1Gye1DeDOYjE2kdIpka3xfManrmJ0LfQ3e85qkVFTeqWJ5u2D0EEFQ
-l2sIg7NQlci30LixHxx8o2ABq7t4Bi3UBZ4YfMFsu46Uus5Iu4TDsEq0V9VhTLzG
-TLzwuznfAz23rBB8BM+r94NQ9TMof8GJBVIUj6aMQ2D3aI/EOBetpk5qiNEI74Vk
-aT8r1Zk=
+MIIDiTCCAnGgAwIBAgIUO6nl6uydnFw1TUOrainPL1W8+uAwDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEWMBQGA1UEAxMNU3RyaW16aVJvb3RDQTAeFw0yMDEyMjQyMjUwMDBaFw0z
+MDEyMjIyMjUwMDBaMFAxCzAJBgNVBAYTAkNaMQ8wDQYDVQQHEwZQcmFndWUxEDAO
+BgNVBAoTB1N0cmltemkxHjAcBgNVBAMTFVN0cmltemlJbnRlcm1lZGlhdGVDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMtgqe5wXO3ZlRmHv4p4z+nG
+xPt6sgdxJxoxWHuNWHYnRomJmoa+bYPWB5kijZ4MUBH2jV2uVq+lZdaJxf+RBpSQ
+Xi/lLtOpQmI3O4GcnDYEu/rTnIQTl1XoDlrB88tQqdkFPAANkafguPwNYiFSEkn/
+XLmC2A2ontuWo6WPpIMFzbra5NSA/PTN+g7bq+X2q7yuKI0TFyRcc0lEXfnpe0j5
+xaeF0oX2NxBCi4d9oGh9ZJX6cEhIkF/Ff1RPCvIpENZOQ1SGI8T6xZCVSGiL178/
+8/gRXE7hWRwRfL7QGo3RIwe8U8NEjysKdZZaHVPEErZhR/FMQxxvioWu5YLFAbsC
+AwEAAaNjMGEwDgYDVR0PAQH/BAQDAgIEMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFB3GIzYx52BDTZhONk4XvvrKINm+MB8GA1UdIwQYMBaAFL5HYvT/4o/gRvic
+DCz+A22/8wZsMA0GCSqGSIb3DQEBCwUAA4IBAQC1WvbMuCtNfHQ0D7e4Ht60eE3K
+LdQ4xPKWndt3o9pk/8MsWpi55SqKP8xGmLOxwysDLEgc5m31qnDYI1FV5c+sBKWr
+oAXK8MIfsnYaaGB8BNk1dspZpst7kOxLeoAsHkZb9DMAirrrSDFmPeMweO0kzUHE
+dDHarN0iiGAB7+oNYt/V2YCDlOTBlAGQ4gwL6enXIXzfTIOBqjIE1uOzbF2RbZLp
+Lhj6n7CzmH979Pr+IzgOUbMuEcRNH8rO7PvJf6MIJp/D436wPUZpnP+xZP/emELW
+pWxbBUsQwIttHM9gcitVd2q7PVdKYB5+ETpXWlC3WQdGqhC8H0AnPL74jPkR
 -----END CERTIFICATE-----
diff --git a/systemtest/src/test/resources/custom-certs/ver1/root/ca-key.pem b/systemtest/src/test/resources/custom-certs/ver1/root/ca-key.pem
index cf1fc61c712..47c0e4da7d6 100644
--- a/systemtest/src/test/resources/custom-certs/ver1/root/ca-key.pem
+++ b/systemtest/src/test/resources/custom-certs/ver1/root/ca-key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/systemtest/src/test/resources/custom-certs/ver1/root/ca.key b/systemtest/src/test/resources/custom-certs/ver1/root/ca.key
index 75cfa745094..589bc61d87c 100644
--- a/systemtest/src/test/resources/custom-certs/ver1/root/ca.key
+++ b/systemtest/src/test/resources/custom-certs/ver1/root/ca.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDgl2Cj1CdJKG0k
-M0DJiv4jgGt+40UuGiXLzvYOa+UEGc3ztf1/WAM3iP2xuum3ILymCODAWQ2KA0ab
-hEe0PxRWX+E1f6ReEy+l65ThQXJU+PxzhdksaM0ekIW2ox4503UYqx/WIW6uhuug
-fhnM+K3hioIMHBApDt+DNwbCvkB9OtvlwZlOhxsAnYdkjTn3uOp4eO1ARHDpEEnq
-S7M7C4+6UQ63K1/1e6uqDu5towqAyfODZgTOwxaA13LBqR2QTYbsTJX7DMKrwVNX
-RvOdIVFTQ7msmvHQId8HtlnehB1xDJaWW9AXLB2rBw5d1jJvzhynRF5bbPZUJpI8
-/tadYlzrAgMBAAECggEAamSLrVBlQ+zYtxtoh5FGjv7Y7YUwUoSkfwYN3gsStHyc
-6eS+r8K702Ub+UP4T348n9L41WXaWhTvL+DcLvDq63gEMdnDvaUNH2aYYpUkWkiR
-HxC7LqR+9wmzri9btD0N7Z+zNzcjPZ5ApQjXpBfyFzQMIzxwE2MuUvSQSVTjK+8A
-sGoyMcYRds8KhOGTictM2UPNLL7yHzqsJBfUKDZyTqaotHzjKIsUmxsDwz7Nw3wd
-4jNjdk2kNuN1rHO0fqTo3SrziUVef3AL7xyTQBpIDBDDVN0Tn++ViLVBf0Frge1v
-0nByPPvPtXRZZc4bMmaqUK3TUPAjXbGnvo5C26evMQKBgQD6ujTNb7Yh5SOA2s3i
-jHaQI0PhXPxYfhl6uHbl+3EQCexp98dBBqez4nTCZNkangoDZIb7EFuv14wrU1Qa
-HgrFLWVTKBemIvcfBvTh/lw6rdYyPoBXs8inM++tfXwFbSYYy86hv/dHjTWMTUav
-5QXQqJqyBgNo1tWzry8K4yaelwKBgQDlUHeumRInhixr3QvG3/J+tXJ5Z4b4jfPt
-sqoR3rGMwgPG4Dq2lBKLVDrPYc5db/w8lvxpmIerwclvgaYgzHErHDsuZ9H4OsNq
-O18551qAa7u8yJ+NwAjkPsA9az+2wLjYMxLKdJPfQkfteTy649Ju7fSgt5uvULbK
-3HXa6r9SzQKBgQC93xFpmfWViY7vX8OWksSetvYKzn4TDbuB4fu4gkfG25z7SrbM
-GZwab534MKLws0nl89T8gBDPAy6VCM+hz6pcU9pttOjj2YrHJl+AXT2++jJBbm+G
-+xEy/fO9sE+hVF0LXhwnBdbfiqJIk6S6Q3e54lT0B/XBCSBgqIO5fPecFQKBgEU0
-DYpRg5sN8OX0ZZN1DjeTBqMAzUjBfjXjz1NpQ2fZPU6NaOqksRv/JWhkeeTU4Ohg
-IHi1oWwCJYpTNBF94UFDWdDdYA5rnYG3vTs6SKOs35FPcmdS5twK2/UtIqNCcgY9
-E5Sprd6YoCBYkC1Oh7kWctb10jQMRb3e3mpcobSZAoGAW+WITBz4QqQqNhK59T27
-DBZ0xmVJhwXkyhZcW9MbtBTSkbs7CQ4aoL1kCbKsrED2bdnP3/h5NhLY4/nsdgqL
-O65qwg6CTvEulglfW8uPCvbYmC6gVhDfL0Hw+mJ6p6VHTcvyZVwlc30ga1PPdfv5
-81W6uzadtd/W/sY2n/4614M=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDVaVPSw5348JYO
+qA65LudkzG3FxUvq2pLJDUPLHsA/IGdtTHARyXcq3QL1TZ/1pR+Wg4Faj3Jd8GbE
+bi9dtL2qYPR7a80IFtdGuqlyw46Hf+zZV4CSVkKeqA7HshbNWpkP416FfR+3PLOI
+vMQAxrbn7GZfyJfdgPgx9mAn/jwhwGyTd9qU9SexAztepZ+YsBd+wpguFRpjF+iR
+y29didXWpxih/y55FC+mQ+PDCw1Hzlbhydt+7mYLaukEo8EWrbv1Ad6fNBITYeeC
+pdfF9P+BEe4X6oI7gL6CYMeNkf2GsceDjejUwy8QrHAtw4Kzs0fSHWbec9UXq8lX
+OAIRR+ofAgMBAAECggEAavsa5xvi1Ake4AgFIXXOz2vfV3X5AalCTgEVS/yFWN/Q
+mSzpPTFmSJl0Qy3/ku+MrzILJS+loEvD6JJnsizJq2BhDoHSzUxN7InkKcC4cVqC
+i81eiX0udkQ+7IJtBdJ1yk4rcvVvcba/NTuTceQrioWqKDfxUTu2r60XNNUwpaXb
+DCZOqLDAd64Pfgb03sExEtMaF72mFxL4EdfvzJJ28uyp1dq+EnrfBUVduTNFhzLv
+q2BUO36qjZepRirTSSsMS1FRqafkz4R+KylrccxBusr3WPbw30eNKSmwgfBHyVsr
+pURM6FjRc2B43fLA+JO/e77qft8srWp1K0PMFNj7KQKBgQDx8SvbYhewnV04gKoV
+P/RnkDzcH7sJABvdApoRORLfvhiHbdUydPJGLvKGoIIoV5pq40DNWhdWcqw5q7Qd
+zQ5ak1JaK33/VsGDP2wF4i1H9lkAUsvXJ6O4WLfXzdBJTcK13UVz4MTYOzRR2ONt
+t3uM9okgfQJM+mLZg5V5ahnI5QKBgQDhz8UXKvPl3TcaLFSdZqhRI3A+fgxpSym+
+7HVrqndyuwN2Dydn4A/6X840Po5L5OSA/vbGEQ5mwFn0gVqZWjuuqaKDIKQfuS4S
+zgJ7bMNZYyXRLj5IaPGtkRCRlwcso7JCB0gmzpe5YaMxPXpgr0lhBEB3jTcfzV+7
+hOzemNGKswKBgAa63axxkxUfm3s54QFMUSEcWwUIgOxkK2I/c0etXcAJiqchv/9y
+T1bycV6bUmOK5Em63o+XxPRrpizIgO8fSBnu5SiK8ytKH4HmHrwfKYFJ8fnXU8I9
+YQl8tkhzeiq/1f23FPp/MxqMswzfypu/sdke9nuH3quDf4JrbZn+AI+dAoGAICTE
+SHz7xP/NZTNkRBel5A7oXmzw9VgWtC/SsyXL5RAL+RVFJbs2awySPMue09zcTiR9
+Gkq5QxUkePKk4+l9T2qkUIgn9MAWd+TNY6Zi1GmRq4oqoYIWzP82XZMjGU6gBFgn
+BCcqX+AvK8Y1kmfBSUciqiH289b3RqkwUqtsQJMCgYA9RTg/CRgqI3lHAHKiUvcN
+/3iSFjsX3jC3K4A9eT1X78G8222F71eYzxmqywp8jxnPN6Po63j4Ms28oUMNpxnT
+kfvSnv3EGlDmn3V9QR9MW9wZ+Lt8crbXAoTMCGjNDGZsHOrxqNgewKnGEHA8DOJI
+fYYIDfLd+bVbhG4WRiQBgg==
 -----END PRIVATE KEY-----
diff --git a/systemtest/src/test/resources/custom-certs/ver1/root/ca.pem b/systemtest/src/test/resources/custom-certs/ver1/root/ca.pem
index 255ab881c75..8a261d992d3 100644
--- a/systemtest/src/test/resources/custom-certs/ver1/root/ca.pem
+++ b/systemtest/src/test/resources/custom-certs/ver1/root/ca.pem
@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDaDCCAlCgAwIBAgIUfwjp9G2vi3tYh1DIf0Xcn3BK40MwDQYJKoZIhvcNAQEL
-BQAwTDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMQ8wDQYDVQQDEwZSb290Q0EwHhcNMjAwMTIxMTAwMTAw
-WhcNMjUwMTE5MTAwMTAwWjBMMQswCQYDVQQGEwJDWjEPMA0GA1UEBxMGUHJhZ3Vl
-MRswGQYDVQQKExJKYWt1YiBTY2hvbHosIEluYy4xDzANBgNVBAMTBlJvb3RDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOCXYKPUJ0kobSQzQMmK/iOA
-a37jRS4aJcvO9g5r5QQZzfO1/X9YAzeI/bG66bcgvKYI4MBZDYoDRpuER7Q/FFZf
-4TV/pF4TL6XrlOFBclT4/HOF2SxozR6QhbajHjnTdRirH9Yhbq6G66B+Gcz4reGK
-ggwcECkO34M3BsK+QH062+XBmU6HGwCdh2SNOfe46nh47UBEcOkQSepLszsLj7pR
-DrcrX/V7q6oO7m2jCoDJ84NmBM7DFoDXcsGpHZBNhuxMlfsMwqvBU1dG850hUVND
-uaya8dAh3we2Wd6EHXEMlpZb0BcsHasHDl3WMm/OHKdEXlts9lQmkjz+1p1iXOsC
-AwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
-BBYEFGh64XvfvIbvXwD2bjlIf41dvwgUMA0GCSqGSIb3DQEBCwUAA4IBAQBJCQp7
-lXS/Zkzqg9h+SFiZZD4yD4J8tjol/TubDA18q66vQl+sOqxyvrBZcx9oBNLMbjei
-AZIJfQF68Wek+lZp61mvgTG4o9syus43SEg2nzN2rMYvQVx5qtpSx5YmQhdVmsqJ
-azoAlqFoMQXGXJ2YZo8y/M06Q9F3A6BWksAEZfbBaqCswseUn44JstQFhIpbC50I
-+6zx9gp6riE0FXzNlq2Gi06yixRiDw9oZB2/+CTW2zFHKyX2DFhey7EL92ESSrpm
-PUG3pPD1l+j86EyJjAEB1u4TlWH7PTbV8nuNbCXut1WI+IrplSgwEtXz8i0YcYty
-S1vO689r9LDTVB+V
+MIIDYDCCAkigAwIBAgIUT98LRnK52FTHAIt0KmA43bkwSYkwDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEWMBQGA1UEAxMNU3RyaW16aVJvb3RDQTAeFw0yMDEyMjQyMjUwMDBaFw0y
+NTEyMjMyMjUwMDBaMEgxCzAJBgNVBAYTAkNaMQ8wDQYDVQQHEwZQcmFndWUxEDAO
+BgNVBAoTB1N0cmltemkxFjAUBgNVBAMTDVN0cmltemlSb290Q0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVaVPSw5348JYOqA65LudkzG3FxUvq2pLJ
+DUPLHsA/IGdtTHARyXcq3QL1TZ/1pR+Wg4Faj3Jd8GbEbi9dtL2qYPR7a80IFtdG
+uqlyw46Hf+zZV4CSVkKeqA7HshbNWpkP416FfR+3PLOIvMQAxrbn7GZfyJfdgPgx
+9mAn/jwhwGyTd9qU9SexAztepZ+YsBd+wpguFRpjF+iRy29didXWpxih/y55FC+m
+Q+PDCw1Hzlbhydt+7mYLaukEo8EWrbv1Ad6fNBITYeeCpdfF9P+BEe4X6oI7gL6C
+YMeNkf2GsceDjejUwy8QrHAtw4Kzs0fSHWbec9UXq8lXOAIRR+ofAgMBAAGjQjBA
+MA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS+R2L0
+/+KP4Eb4nAws/gNtv/MGbDANBgkqhkiG9w0BAQsFAAOCAQEAXqA6GCH8XxVOlWUg
+lo8kdLeGN4qdq2/nNEuPDe+MYxzuGxYS1ECatuzs9cGOBvpSsAw8z1iNJvf1Ea6l
+ijLDVoiTzCA6OxlPINzfbg0jafMDn2CvdCMH4ZHr6W+J0L4dzYwk8cWnUE7HKiMp
+gcg8NoQ7T9Sm6FaG77Zzct5WQ/HlKQlpJt40pIw4hRF2KyqgoSYkN2CJHHO047KN
+mpl2S0P9J3au03m63uAOM88GiRGQsguQnsBE4+hYhopqAwDYWSxjFYkKueKOo9bO
+f+xwwjvm0N+p0+TTPW6JH3TQykowKKnAnNkWviAbZmtR3z1H0A9YXnNPxbefMFFI
+wPKoPg==
 -----END CERTIFICATE-----
diff --git a/systemtest/src/test/resources/custom-certs/ver1/strimzi/strimzi.key b/systemtest/src/test/resources/custom-certs/ver1/strimzi/strimzi.key
index f2fd4ec671c..3ae1f4bfa9b 100644
--- a/systemtest/src/test/resources/custom-certs/ver1/strimzi/strimzi.key
+++ b/systemtest/src/test/resources/custom-certs/ver1/strimzi/strimzi.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDLqWOOCTy+r6Fr
-DCAZQ+E8Si04g+1hj5dtHs+1SYJKWlarZN5Ygs7runew48EMQhowrHsGtupsCdRS
-SThAtjKUOKoKhlExFiFy94du5rgeN6qJrGGA5yk0FcMkpkeeIhCGB0GQahO7CVKO
-HMWXPQLENb6dnjC5yw0N3zDXIN44hUZOuyw8fdEsHYIlpKk4uXu/OqDuMv9WzoNH
-3Qrw8h6rf/i0TF7g97PYl4B3gBN2OfSaYIo7/GWpA1eBfX6fVlk1YeDs/MITtaLo
-ZAmgRlgOdKFvpDyksD48o/A6yKlDJENev586gn2OZ7f0Nx3i+KpT25B7A+yoJdV4
-qr1dBK2NAgMBAAECggEATJrjWoq48ZTIZ6aA8F/q+a2BAvAEuxyyvZXIVQ1YV7VR
-QljHlY1mXZ6e5MdWVtEKXuKRx/3HgWnVFjp6UUT3E2+Y7iqFoawMWt0mcR2RhbQ0
-jmJrrnvEsNW6uC9fYui3RGK4U6TC1Sh1iATkgbWuM7VvhIP7Gfd5ao1YJqMzUxiK
-KcFmgr97upwoNb2pwrs5jZBVhT8EV47+9AOAso9kf2TtziZkDyHI036zRC2qyfez
-Tv281diDDO1sM2UDnImMoP3xY7/I1mTPGfVONPvlz2fD+ntOsDkLq2SDO/ELykBU
-AEqGXBxEiGd7MiT93beAGi1jYPQrERUTR0oY5gc84QKBgQDz+PJ5OgFlbGsZEn73
-c34bg7p6Ddr+hT4XGye/NbGzQjvzmknKA1Mvd6x44G+ntOgS5ngC4g+Ahb06Ehpr
-TAH0PGFE7sxrA8GLl5k70QfWFGzmm2d2V1hE8X1P7XEoyjLpi3Ux1RjgzyBwT6/j
-R090aofsNzsdOK5fJEhfVGHZxQKBgQDVs7ModlSZlk24OEELERV9Et2IXUzyjdcY
-7bf1FsYC434POePRrL3OEUUvIH/kwRjARC+wOHDLs07+KE9dYAIPhPxjmw/8G95k
-R/NLEfIeNICDcYPOWvi0Asau62CfZVMHgfM9HBvfw8u2lDDTamQPFdo2+uryC8JQ
-OS6d9ltpKQKBgQDfob1ZI7Nt7aCJ/etGFaZtwCSphpPLpAUTFwArBCPcBgWAOVgU
-BVI1+4Or1UZjuq7TzFALjH3bODwIw9lVqvlLkCE1F5NnMK0zsIV0UBnXwSdFhwOi
-dVPi9l0Aa8zDL/zVGNEXGZdRUmsQp+q48X/CXXg0LThRg8hKS67PO0DqZQKBgE9e
-59rOYEuPFJyoYBgRJ08F87vTE2I/JjW/DQT9iVvHTKmxEZlttC1WIsEHLBk1UtEO
-QjwMKnCtz1f8dsWyg/Fprif8jqpPW4EZbBZkuu1XCKhJP/Ajv510LoEHMSLiij0O
-md4Hk56/ZOkSDzRmnnUv45VqClsN3QTYyCSpPHhJAoGAIjiV4UjWD/5CweGwqv25
-BwfnHpGZcI6ruGaeDaS4t4t14nyoWCI++b4H8yJeGSqSvSMDxRB+syOMPNYIFOEb
-v7ObxQ6Ns9P2U6snQjP590eSPWQeMZICR8NOP8mekpNvqPGbit3A9FtEe7s0t650
-Ygz8kvHDV55dyq1iDnzF4tE=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDfOEyFjw0s6df6
+Q+vBs+hZmc5wjAb8e1Exc0WNXy1sEfMvxz/kcp1WiGT7o3PHy5wTXEFJh4+yzNmS
+NaSaA4TeHflU/UKl4caTeCUvF4FLU29tdwbe2c6CPN4rbYixkJcqHbuOao86Drrn
+u+FKGIusKhe7dxKrELzYxkgn9WIw2XkguNhuSvYN8+5cHtvl/tMGjKmYAYFyb/5I
+2Lf6uUw/hxlEmuGN9Vi0rD+xF8jWL9u9V+pEoelgFbhLdYFO5RwH61Kq6rRb5/PD
+H1COjSI9M9mPI44PctpKl9hCnimmATz1QnIT3DqeOKmasON5MufyGdxTV7/rfhaV
+ujafiMyDAgMBAAECggEAVKnM1EdqruNOyJxkWga7lOhyVVu29qJrLD9VXQaBeuDg
+BPoksKgMJxr6ejsHmfsPCoTOOm5RQXbS+tKfyM6W4Ywq2mJomfQlVh+WsuLOZlyS
+AcnIcFPaMKmXdo9H7lkyDIZUcfLWuiWGHIi1LV5b84PPlonWKc3iYrHqAkXe5TmR
+VMupgPrIKnDqZM0sVnjBkt4ywSLZZZLAbThDGbQrJQ1HabDIkH+9qC3EGsjkaIwM
+cS4yUAClGuJuLxoy6RgGKL6KmGIk80PR6S/EUFRIJqbz5nvQ7FhZfM74+oLaDkKf
+zEs95zAmzowLH3zM0yhYkCEDgPvZqo9btSJEoiKw0QKBgQDjCR8IYZ7UZfKSnOhO
+BBjMEUhNwMrWoUSUCpsXDmj7NLymPPQgd5T+Yi8xTW3OKh07a/QX0jL3NK22VCOK
+Qn7nZn8LS3JPdfgDUKOBD4ri9kLI08PD1dCz+RvVJExVKtRcJ1QcfMmbyEDdyj8q
+FRp8unGXlFls/Dg8ZyEkjHbXKwKBgQD7so7sdSQ/BCN1s/3jYJhCeBNpc9ADNVCN
+iaxUCsZvsyHnI95Nzw2kAwHowwBC72G407SseQ5XUesvJvgjR3wZNPqA1NGZkAaw
+DvAMlpjyOKqS7R7u+vOQdQ1XoFW3l3BV3NfpXWCvrXlkBtLB3hBJGj97HTGlpBcv
+ZoLOh7O0CQKBgQCOTctLv5SEYRo4V20saVj5n+OICM2a1h5cBIHNY9Tdj+Km+BG0
+v/99qyEVcAjhbnhAJJwsyi3z0OsJG5fjM2bDt/TtqW6O68x2l3bEkG9nbx/RLRrJ
+hx13kS6m3EeUInJVCLmp2XWs1UoDOp94yx19DIfikLO0oirFgYa+l+RtXQKBgB15
+5MkGUu9aUbjIEnSdbFdkbomL+ZFWng9lTxwsgt6z8MV76t3b4LITdBbJN2+fTydx
+C5ijOK27Nzq3apnfFkZxcODDi6RbPJ1DspMW0+SSBE/emx/LndiODLj1WvR8NLip
+e1OmDtukCjJPpkDz+55EB6koWxcV520yqSD8vWvZAoGBALKs2Ria+PVKM+Uo3glB
+d9UkPwgLBEdEGbHAa3N4tmaAcvPrvQ4A60eANvNcKcBI+O41E/DJvjlQRfpgqf/l
+Q9xKeVobG5fu+hwEINjWyvTRnDQkPJyyVczGBiRim/uLmikehiW713uxOKl4TeNl
+UFbqdSRUOpDs4pUI443/E3Xu
 -----END PRIVATE KEY-----
diff --git a/systemtest/src/test/resources/custom-certs/ver1/strimzi/strimzi.pem b/systemtest/src/test/resources/custom-certs/ver1/strimzi/strimzi.pem
index a3b47b527ff..f6d1a888502 100644
--- a/systemtest/src/test/resources/custom-certs/ver1/strimzi/strimzi.pem
+++ b/systemtest/src/test/resources/custom-certs/ver1/strimzi/strimzi.pem
@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIID2DCCAsCgAwIBAgIUY5+/5fre7Yye9bdcLkaX4rfuwOwwDQYJKoZIhvcNAQEL
-BQAwVDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMRcwFQYDVQQDEw5JbnRlcm1lZGlhdGVDQTAeFw0yMDAx
-MjExMDAxMDBaFw0yMDEyMTkxODAxMDBaMFYxCzAJBgNVBAYTAkNaMQ8wDQYDVQQH
-EwZQcmFndWUxGzAZBgNVBAoTEkpha3ViIFNjaG9seiwgSW5jLjEZMBcGA1UEAxMQ
-a2Fma2Euc3RyaW16aS5pbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AMupY44JPL6voWsMIBlD4TxKLTiD7WGPl20ez7VJgkpaVqtk3liCzuu6d7DjwQxC
-GjCsewa26mwJ1FJJOEC2MpQ4qgqGUTEWIXL3h27muB43qomsYYDnKTQVwySmR54i
-EIYHQZBqE7sJUo4cxZc9AsQ1vp2eMLnLDQ3fMNcg3jiFRk67LDx90SwdgiWkqTi5
-e786oO4y/1bOg0fdCvDyHqt/+LRMXuD3s9iXgHeAE3Y59Jpgijv8ZakDV4F9fp9W
-WTVh4Oz8whO1ouhkCaBGWA50oW+kPKSwPjyj8DrIqUMkQ16/nzqCfY5nt/Q3HeL4
-qlPbkHsD7Kgl1XiqvV0ErY0CAwEAAaOBnzCBnDAOBgNVHQ8BAf8EBAMCBaAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0O
-BBYEFNiIRl+fB0U+BmK6ZgVKY5ioAF7AMB8GA1UdIwQYMBaAFLVhFP0/k00g4+YT
-lL3FKgo6VsypMB0GA1UdEQQWMBSCEiouMTI3LjAuMC4xLm5pcC5pbzANBgkqhkiG
-9w0BAQsFAAOCAQEAQ4KCh93Oc80QkQmN5/hw8D1ru/m7apQOMeYFu/wQzTylyxJv
-FBdlxgdtfMZxFth3yhv7Gd+ftMlknJjYlB68eHXdlhm8pY9Ip1Y7Ks5uprq/Jy3p
-MBaCIfWCoRGsqrXtEYLewbRvh6zOGAAPrBxPDOSZt0GKd3Ivn9N7fv9MVF04LjqE
-Fx3EE6WMb+lezy/uaVuCN1UAFwwk3pHWOHfXIMze9xWd6mAIDdjGfCm0dVoYjdN8
-kgpHNFDyJv55SSuQ10LhxvAVp66Pb4hFfdAT/ItE25xGAUeupJubEpqGqPEZZG5r
-UmE8fUa+fs/tkDyFsWP58hgXxvr1e5rG+zn4kg==
+MIIDyTCCArGgAwIBAgIUDkvI3Wv5CRh0RzB8MXkv41NBEscwDQYJKoZIhvcNAQEL
+BQAwUDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEeMBwGA1UEAxMVU3RyaW16aUludGVybWVkaWF0ZUNBMB4XDTIwMTIyNDIy
+NTAwMFoXDTMwMTIyMjIyNTAwMFowSzELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlBy
+YWd1ZTEQMA4GA1UEChMHU3RyaW16aTEZMBcGA1UEAxMQa2Fma2Euc3RyaW16aS5p
+bzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN84TIWPDSzp1/pD68Gz
+6FmZznCMBvx7UTFzRY1fLWwR8y/HP+RynVaIZPujc8fLnBNcQUmHj7LM2ZI1pJoD
+hN4d+VT9QqXhxpN4JS8XgUtTb213Bt7ZzoI83ittiLGQlyodu45qjzoOuue74UoY
+i6wqF7t3EqsQvNjGSCf1YjDZeSC42G5K9g3z7lwe2+X+0waMqZgBgXJv/kjYt/q5
+TD+HGUSa4Y31WLSsP7EXyNYv271X6kSh6WAVuEt1gU7lHAfrUqrqtFvn88MfUI6N
+Ij0z2Y8jjg9y2kqX2EKeKaYBPPVCchPcOp44qZqw43ky5/IZ3FNXv+t+FpW6Np+I
+zIMCAwEAAaOBnzCBnDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFGseVQtXR7MOOb82
+/qh8uEGvSza7MB8GA1UdIwQYMBaAFB3GIzYx52BDTZhONk4XvvrKINm+MB0GA1Ud
+EQQWMBSCEiouMTI3LjAuMC4xLm5pcC5pbzANBgkqhkiG9w0BAQsFAAOCAQEAoGKP
+Zlj937wEx4ldGyOADow+et8UCOIGpv1bJ34FDmcwcNCj5XhE3YHjYeKMz8vXFsZA
+u2qCNeP+RICTjI9P1XCphtk0h6tHwRZn+1wcQXYf9wsZzaPiDb06KsZCKrlF3Hfm
+Q9DtAgdMY3v47veTeIL5qhogz3JQTMzOcZWIvSa6zmBVklr4kGpg8C/F+T6eM77y
+BUV/pWfvFUoJD5DjgSkKjcABDyG8IaiLlW9STFwgJTIJRRuilJjN0+hlgXEF5dW6
+niwqr64IhUFAScYIzbMoiIOhs3HaoH2BWHTFns11rmFUAQPK7P6zgiUgdnQcXHgP
+IYg7nFwfS1kJ29ZhCw==
 -----END CERTIFICATE-----
diff --git a/systemtest/src/test/resources/custom-certs/ver2/chain/clients-bundle.crt b/systemtest/src/test/resources/custom-certs/ver2/chain/clients-bundle.crt
index 6dc70aad309..3a062ed8bee 100644
--- a/systemtest/src/test/resources/custom-certs/ver2/chain/clients-bundle.crt
+++ b/systemtest/src/test/resources/custom-certs/ver2/chain/clients-bundle.crt
@@ -1,65 +1,63 @@
 -----BEGIN CERTIFICATE-----
-MIIDlDCCAnygAwIBAgIUZKtJKZ3yyVlXiPvnDq5oDD1kGJAwDQYJKoZIhvcNAQEL
-BQAwVDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMRcwFQYDVQQDEw5JbnRlcm1lZGlhdGVDQTAeFw0yMDAx
-MjExMDU4MDBaFw0yOTAzMDcxODU4MDBaME8xCzAJBgNVBAYTAkNaMQ8wDQYDVQQH
-EwZQcmFndWUxGzAZBgNVBAoTEkpha3ViIFNjaG9seiwgSW5jLjESMBAGA1UEAxMJ
-Q2xpZW50c0NBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3LJ2Mv5U
-tfqFNlmWMFJbB+x6Nb7RCG3iJmGUU3la7vecTJoMn5U+7W2OoukXdewp5AvTVDRg
-Rvu4xivTEWQP5TYIgmoftZEAYNb1aIuGaeqSXGFGeALhAQ+bMLBau9mmVuhIVVip
-fXcS/H0ianu04WeVADIrh267PtBQTpFDjcznoan51emzqxY7NGSVshpCI5NXTOJJ
-hO5e+eAiFnNxGQ7wOgXdJWcUDKz2o3W5I0t+jqxFFC1gllmntYBDb9fVDSHH1eTv
-pD4xsid0HoNK38aSu2o5FszodZERdCaXDhuli7LFLtBbF7W8ai777XY1OAiUC1Em
-jn+1U1I6Jr7J/wIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUUSrkYDL0kVI4ja17U3KnVGpBhXowHwYDVR0jBBgwFoAU
-ZIY9lHgdx3kH6uVmEVf8rIf4cGIwDQYJKoZIhvcNAQELBQADggEBAFLDNE2OLuja
-mHol+SbAhRs8ph89ObSgyOVaCuM1lo+3z6PVfYdGV32S12FUv8SOydBXU8UCOGBf
-fM6IfJp6sQvKAyXKL/0zcd7Kvi1IENCzjGobMR1yz1LiMZ0cd8Y12EyLmUW0cIrZ
-ix/eATjz423qynWX8vEVA1pcwIDvsC81rbi92omi6/HaGJG/J6TjOaBn6KABQAQl
-a9xp5UqJdbT4zGyIjRuMZXbtToM9xzVIH6lwdDxiYC1YKP8uQtBQA1MlypJukf5Y
-7k0ZWHYdOuPrpVFIZyw3ooIpGWUpTOaSDJ4z4yl5uepDDB3cFoqprLdseHgb+nyB
-rCGb46BtvnQ=
+MIIDjDCCAnSgAwIBAgIUeVpKAvFuhTs7B7T62lK2ozJoY7wwDQYJKoZIhvcNAQEL
+BQAwUDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEeMBwGA1UEAxMVU3RyaW16aUludGVybWVkaWF0ZUNBMB4XDTIwMTIyNDIy
+NTEwMFoXDTMwMTIyMjIyNTEwMFowSzELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlBy
+YWd1ZTEQMA4GA1UEChMHU3RyaW16aTEZMBcGA1UEAxMQU3RyaW16aUNsaWVudHND
+QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMJvHUjgxwh/MtzSZuhr
+NPETffJ1bHtI+gl44HRNa3Ip3jPWfMYOUSkUFsKXnEDqkNbft1nXBZitKxBo69wY
+SpWR9+ORckRqBLQAHO5vHfYFvPkWaS/Jog2TY8JIBxiw0r9dN8E7EupVs76oaHRA
+/5iWH81PIS/JQba5pOCtpzGWDUVlYDD6KdZ4sWgWSwEdPVjhy7dmtIUOAC63QQU+
+Zu39hG1zSOowITt0URnjGr8NSgKAcHpCIFabmjahVjZjn+YC5kkLI4hcDu+ZycmT
+CWqFCcbowUqv3Owid6EweuEEjtLTu0cPpynf74Ls1xEQ0BUCS4tJMAMqbvx06ICs
+8fECAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgIEMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFAXIZUgzWsKIDykjbP3N0j/LysQTMB8GA1UdIwQYMBaAFHVij5x3WgNO
+oBuHUmfPhe1hbdGOMA0GCSqGSIb3DQEBCwUAA4IBAQBUH7U7t31Mgt+r0CqpS1MO
+dnMkra+Kn4dsD+vFXW88zaYXT+iQmo5ARX3Zh9d3MEpglsUGDe3p7zxZItRk45hO
+kGQyUEsmzme3per/dQuU8hJbgSFD6oQvtXELYxQ28jb+ElNWcPI1AKUt5CflO+uA
+C2lcwo1soGSWcfbFLIQWAMB4a4vgwGeGOG3iX4MYRcCkxFKeawFgENlq+zku/Wwo
+nt1cBw/ciMQdprGRnsD0H+icv3GXWmRveGCFvTLqw9g/A07LR8ePOFFcVh+ztMBv
+gUa//Ozsx13M3KDICmBXuNYCzp0hmbUD/xmBFDW9CDggAzw1jSS0fsLptvKSxZOW
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIDkTCCAnmgAwIBAgIUHA+NE4E1T0MvykD2sHwPS74TRTwwDQYJKoZIhvcNAQEL
-BQAwTDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMQ8wDQYDVQQDEwZSb290Q0EwHhcNMjAwMTIxMTA1ODAw
-WhcNMjkwMzA3MTg1ODAwWjBUMQswCQYDVQQGEwJDWjEPMA0GA1UEBxMGUHJhZ3Vl
-MRswGQYDVQQKExJKYWt1YiBTY2hvbHosIEluYy4xFzAVBgNVBAMTDkludGVybWVk
-aWF0ZUNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1A0VU+lDDS0H
-SvEKAX+HQBiATkiSx63g5TsEVyqtJaOJ7Igh62HUFs0KXqdLT8VBrfDsQIKInOM8
-dXrW74c6CywtsQL7jcGX8NG5/SV3JlZbwCCnNYYsUS1svI3PzXbB4rw6yVb532Lb
-iKk9GfntxBNPxEEM2lmh4xuICqVJ/t3cf9axD8rxq1ziSBWefN5Nqolo/n+/NW1Q
-01NvDTSctzSpZXdbvoLKIVs6sfymyuwrKRTofgrcr5DxHI/KVAExHsMCmzJ+6egs
-N4Z9LW/yJP8IWn/SHB91/5GF8ScT6aNvCmFjejj3XGAu3tAOFxDB8mqGRbhjrU7Z
-zpCB9WAJZwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQUZIY9lHgdx3kH6uVmEVf8rIf4cGIwHwYDVR0jBBgwFoAUTVBQ
-oStX6af1hQq4fjCPKB07+e0wDQYJKoZIhvcNAQELBQADggEBABSCM6VkaMLc8AJ+
-3zlAAzhHnQC+Hi92dbqIoYM0skXHbni8lCPffwDf0egX/deTHHxx8Bc9F5Ew/sFb
-cFzzK5JGCcFC13AurE6bn/l5oM2zTKhLjuy6JczjYJQVQruUrL6A0ujIYIITod0c
-O1SXlsuckZbowmpxwz/3r0rR2kvKpfLSwGIiCbMnQJpmx2LNsLoMjwegmUsbS7bI
-Dg1XMfchiH07M1N7DPg0LRSXuBlE1pYvb71RlWiB0CvuqGbCdtWDLoEUJ5YzXipU
-sp029he20NuJK+DiM571D7oR5TOhKM/jv8FSQ1c8hWsQ96+9VfGHYlmYq6XQpAwe
-Ckt5Xao=
+MIIDiTCCAnGgAwIBAgIUHoERrkz+UsLdJxGsbB2FXW0bLeowDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEWMBQGA1UEAxMNU3RyaW16aVJvb3RDQTAeFw0yMDEyMjQyMjUxMDBaFw0z
+MDEyMjIyMjUxMDBaMFAxCzAJBgNVBAYTAkNaMQ8wDQYDVQQHEwZQcmFndWUxEDAO
+BgNVBAoTB1N0cmltemkxHjAcBgNVBAMTFVN0cmltemlJbnRlcm1lZGlhdGVDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO80bbNtT3GCJcSCNwkVCobd
+Rzxn3lGNPsW7IT5rinSgVHtipOwqHxj+agHilRMrxyYA0Xa28U5O/AsXxOsQkN0t
+dYu+/bHmG1P7BNJb4yWhCptLWKvtq3SbP2hWJQjVlWhnUj/3tyE/LIibJNCgHJja
+w0zy0ACzDGpsMgojrYvVF2u+y4O2/4nGmGbAGWWUavCNFCruTzJo7VMF/oSul7wn
+vxxVaeEgc8WqHaSVYvUAw5d5nFOFLO8V2ajp5Fz1Lfvc/YHkPcLRjArTSvZV9T8j
+n60GTlvxAGcHBJ+/mJbMyxboBeml0L2VCuroJgbRd/9nH7ajEKNmljZ2/Qt4f68C
+AwEAAaNjMGEwDgYDVR0PAQH/BAQDAgIEMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFHVij5x3WgNOoBuHUmfPhe1hbdGOMB8GA1UdIwQYMBaAFB6ccAPQBiiWVkW1
+hw8+pJkhbIoCMA0GCSqGSIb3DQEBCwUAA4IBAQAoIRSRgGjqBouNFHltQmr3674m
+psFt/eVRuUCQ5V/AcNUXLNY3w/NKhkULwZ87q4SoLtiqaZdKJ1GO9BHNfM6aG0HI
+40OSw/OMwq03BnQpm2POOFU+4sKXUPcKUjmsM4hlKB6nDK7+c3jeMEizCj9dxGSV
+QWrqEeMKeYemwDUiUoLPd9004T0igzAHQe5eCZ8ZLmXh8tsqkoAW+ZpZhbFIJlBI
+Me+y/vWmhlyyJfb9qhx5PidHBPYqnuVkBoYL2XoYLCYU4iEdxCa1sPZgi/mlVFV3
+q3TONbJKDNwsymgx/03kOCSZ6iIWrKBF9aZnVDlKvGzfnk4g/BlqaZMOA+aK
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIDaDCCAlCgAwIBAgIUO8QfwMrit9j2QhaBYi+nh1zvqTwwDQYJKoZIhvcNAQEL
-BQAwTDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMQ8wDQYDVQQDEwZSb290Q0EwHhcNMjAwMTIxMTA1ODAw
-WhcNMjUwMTE5MTA1ODAwWjBMMQswCQYDVQQGEwJDWjEPMA0GA1UEBxMGUHJhZ3Vl
-MRswGQYDVQQKExJKYWt1YiBTY2hvbHosIEluYy4xDzANBgNVBAMTBlJvb3RDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJdzfNL8D3PdgsWFfnNam4/O
-aYtXbtrrMdeTwSY9zikwLhhTMIo4H6CgMO0TVI1Hku16ZkQd57HON5NrRFyLOKRn
-QZWQA1rg7fIBn+0qtjElGh5Tfi6JKRbnUxTiUqfDdoh2u+QHGKWN99NqMa9QdmzH
-kDvUXkRcEP+a0c8tGPS+a01Ue2qnP+N2Rj9PMwpYmYcWb2NzIhnX9w+fobtbrdE3
-Y1prIM39MnquoUr50QrIgKPwvwzN4HbbmwAIZPgoODMwAg3EEWwEOVO4O33FARDj
-wpIaP1PgKV8/t4zht9Yamkna0nskfbGD/ocvV3ZA42UESqHY3oZ/ob22h/MdfVMC
-AwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
-BBYEFE1QUKErV+mn9YUKuH4wjygdO/ntMA0GCSqGSIb3DQEBCwUAA4IBAQAI+PA4
-zzWlh4kW2WODZdD9d8Ey6FFMpE43cLU6FXVqBVuHPfls5pp918+YgiHrr5vPCHn1
-OBcj+1BE4HkyITKtmnVJPWXnKwmwygwn7hyK3KzKGJAXJKDhQeRIrBbokGDxjpj5
-kzJg8bWMTuP3tlWur8DAbP5NoFLJni+4hbLQkyMzguBvLzA2fv85Xu0u6KUOryJ+
-NdnQt1alFsRpl1az75YcTXv5ac5GvKIhPVFC9vM8bhRSn/M39cmTbCGjc5DrcJKN
-9rgo6/NMsJU5FEML1Jty8vOSZsHFv2rDykJHArANAmjEkV2rsJHE3N+3SKuzrUiI
-hQgmZkWQiscIRv5K
+MIIDYDCCAkigAwIBAgIUQvVmd8amI67R7MF0G2PGpJR/w74wDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEWMBQGA1UEAxMNU3RyaW16aVJvb3RDQTAeFw0yMDEyMjQyMjUxMDBaFw0y
+NTEyMjMyMjUxMDBaMEgxCzAJBgNVBAYTAkNaMQ8wDQYDVQQHEwZQcmFndWUxEDAO
+BgNVBAoTB1N0cmltemkxFjAUBgNVBAMTDVN0cmltemlSb290Q0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDn4RhhH6xediUowLNXJTTTh1Oa1U4uUONQ
+eMxZBADNH6FCDi2j4OLBz9NbT2hpSumFV5rwR1SA0rRtA/nK/dOrArdMg2DE414r
+xoMZz1eYcPjbtfhPfecj7Q5rswyM4u84dw+g+DLq33Ko9iXTdp0XfUye65cq6JH4
+h0KNJ6pimSQpZcEEGkfL8/dOriZ7yYBpt9pPvz/6R79YIkFGzvWoo36YmJRm3BXr
+DariBM4RQoyAhhD3LMP1AZbHHnaqn6+aK+GSnK6qfNL53RUZ6oFr+XuY09Jdm92h
+Y1pLLeXUfNcaoK3gw/tDf6YaH5GETi47DkSXoY5QNMqeqlB6e9ILAgMBAAGjQjBA
+MA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQenHAD
+0AYollZFtYcPPqSZIWyKAjANBgkqhkiG9w0BAQsFAAOCAQEAx7cuX8D5lIbdAQKL
+q4NWrFiQoiosjW8NyNg0QI7iWmqcu+VosyE5etxIF/uXOpmICvAa15SnR8+VsEpI
+8GuYvWgx9mVo6R0UZ9DKrJGe39k7Ekgrget4CuIHhfHgfCrpP5fvIJsxW/RneWmi
+4yVHVMRUcZXfH6/kUNVY+rRblmN6CXqn7wUWp4tgjKEgOuS6R/OlxqFygEo9Jeyr
+n6otd7MzXyl2JudD63sv9I+WkGLaCSb+5dVd/i8BjEjTAGkGUBw0YU1UMdqHuiUk
+lQvFZ8YLBZbWjXpZlhVg7hjenHL1v1ThhoUMgaGCoEYS4bOnagWq3RJhrcqzAmir
+pVB/mQ==
 -----END CERTIFICATE-----
diff --git a/systemtest/src/test/resources/custom-certs/ver2/chain/clients-key.pem b/systemtest/src/test/resources/custom-certs/ver2/chain/clients-key.pem
index 0f19e6f77d8..46f7869ed75 100644
--- a/systemtest/src/test/resources/custom-certs/ver2/chain/clients-key.pem
+++ b/systemtest/src/test/resources/custom-certs/ver2/chain/clients-key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/systemtest/src/test/resources/custom-certs/ver2/chain/strimzi-bundle.crt b/systemtest/src/test/resources/custom-certs/ver2/chain/strimzi-bundle.crt
index 2a9351fc127..aebfb22be84 100644
--- a/systemtest/src/test/resources/custom-certs/ver2/chain/strimzi-bundle.crt
+++ b/systemtest/src/test/resources/custom-certs/ver2/chain/strimzi-bundle.crt
@@ -1,66 +1,65 @@
 -----BEGIN CERTIFICATE-----
-MIID2DCCAsCgAwIBAgIUfxqU7q8SaHIi2sGVi2OmQfv0gNMwDQYJKoZIhvcNAQEL
-BQAwVDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMRcwFQYDVQQDEw5JbnRlcm1lZGlhdGVDQTAeFw0yMDAx
-MjExMDU4MDBaFw0yMDEyMTkxODU4MDBaMFYxCzAJBgNVBAYTAkNaMQ8wDQYDVQQH
-EwZQcmFndWUxGzAZBgNVBAoTEkpha3ViIFNjaG9seiwgSW5jLjEZMBcGA1UEAxMQ
-a2Fma2Euc3RyaW16aS5pbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANIzxV80HudTvLWL54FWO+t9Ag4yP6iADRNB+HfU3Om1VO/Jh6aGbNsQCGxGPdth
-VW2NituJwbnlUNveW4g0AApw673fJ6MvivTfeiVfzU1kjkNxR5bRE0vTUXobH09O
-BSb8mvhJDrfAWzC8tpowDpS+Cq4KwY/8FZ22cFTPfAw3c+he9WZBuTloQ49fiY9J
-7KlDQL0ZCwPx5THvyjCSo5zoEDyCyubMLhVfEEvVlzMJ4diTlktFZKLhk6HMbHMr
-5Fe1mxnku9uHAnS/yXnA6b1ejiM+qCye3PTtBcbNPHSg5unioulhUxzHpC8qc2vT
-ul373X3L+LlO0Xoz8ZULJSMCAwEAAaOBnzCBnDAOBgNVHQ8BAf8EBAMCBaAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0O
-BBYEFLLT3C1aelVP4NP/l+GOobQWAL0zMB8GA1UdIwQYMBaAFGSGPZR4Hcd5B+rl
-ZhFX/KyH+HBiMB0GA1UdEQQWMBSCEiouMTI3LjAuMC4xLm5pcC5pbzANBgkqhkiG
-9w0BAQsFAAOCAQEAxFAoA1+Xhh8SHBCMsyA/tqS6zl0BVKocRbwYws81EAE45Ass
-fNmvzla9270awCkaj87hEvyFV/brbztAVBz7aQC5n3BLH6JGLnWS4rvxaz5diAW6
-4+CHKrp3DxLsMqWgsJC7K9m0i9dKkG3QYoTbVXbVrvfS9iuaT9ZgyQS0hdA5zDqn
-MfRJ/Nrpnt0d4w7edEySrMu37DXdOnUh20yTVVo+DfuViyunecRrGmzpu7bTnXbn
-fsMj50KWyBBiH4ypt5W0iLtq0lOYjGi+8H7D2iYEBRoSEwbQlNmkyuX5wopIn3F8
-JE8YKhaZ28m1XYbJlpsRItlFgn+V4oNTVxj8Lg==
+MIIDyTCCArGgAwIBAgIUOP7s/EuEBZqD0tZk51bv95BEK3IwDQYJKoZIhvcNAQEL
+BQAwUDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEeMBwGA1UEAxMVU3RyaW16aUludGVybWVkaWF0ZUNBMB4XDTIwMTIyNDIy
+NTEwMFoXDTMwMTIyMjIyNTEwMFowSzELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlBy
+YWd1ZTEQMA4GA1UEChMHU3RyaW16aTEZMBcGA1UEAxMQa2Fma2Euc3RyaW16aS5p
+bzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPwDhqGWa0y24+34DWc7
+01jCA8itu3ymSsIEqShMPpmLDZHzOLVbS1XeSckhZv5v12poCFs67VYh5zpJ3ox6
+TCw7kxsDROemSphulBZNCFnXRPeoa1TxzWRUb+IQfKiMkb02e7P+t1Np/BMRZ9lE
+tXT0W3VDm6uvlqpML+qeapaIFKRfUGT/Bk68MRyKTBg6+/Kyzv/q0nko0aaLgCv7
+UxWiWA7QiW//ZQROxfbxV+ppVn57RLYaL3lIE4z5AwClEa7247zEENmgM1Ue1abt
+BGB0+KfB2/lTeI4eXtYfFOurhX798EASBt33QozLC0DEYf7EfTJL1z48Y3HjAjYJ
+zOkCAwEAAaOBnzCBnDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFC1QMO4abbE/GsZ0
+/4YdjcYiHyelMB8GA1UdIwQYMBaAFHVij5x3WgNOoBuHUmfPhe1hbdGOMB0GA1Ud
+EQQWMBSCEiouMTI3LjAuMC4xLm5pcC5pbzANBgkqhkiG9w0BAQsFAAOCAQEARWei
+Cxo3kOSkZpSz1Kj6+cpc/ktyRna7dngurtjJrBl0ZuoylW2pH4CH/+jDmQ1zO8rK
+ZvocpKhlCl3jEfujo8cZq+FREObS65MEgRxn3Bw07RpFjmjgh3o+a5BLgZLDut5o
+h5EvUm/vRoP4DQ1e2ZA3cBa3I9RU7mbTMFl5qnBzJwXCtaGo1V0C+yGaCRTHnrCZ
+7o/Wn6ibRmIzi+btSediYG2oz0qGSlohvU++trDkcTcfcFaVV1qryauHz2lvXy8T
+Jc02eeCx2IpVUaRVfjZV5vY47YmDqjUXIcU3/4KTnRXMgA4D4TiVch/TXAsQixt4
+tYtOQhD13tOf+Vyp0g==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIDkTCCAnmgAwIBAgIUHA+NE4E1T0MvykD2sHwPS74TRTwwDQYJKoZIhvcNAQEL
-BQAwTDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMQ8wDQYDVQQDEwZSb290Q0EwHhcNMjAwMTIxMTA1ODAw
-WhcNMjkwMzA3MTg1ODAwWjBUMQswCQYDVQQGEwJDWjEPMA0GA1UEBxMGUHJhZ3Vl
-MRswGQYDVQQKExJKYWt1YiBTY2hvbHosIEluYy4xFzAVBgNVBAMTDkludGVybWVk
-aWF0ZUNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1A0VU+lDDS0H
-SvEKAX+HQBiATkiSx63g5TsEVyqtJaOJ7Igh62HUFs0KXqdLT8VBrfDsQIKInOM8
-dXrW74c6CywtsQL7jcGX8NG5/SV3JlZbwCCnNYYsUS1svI3PzXbB4rw6yVb532Lb
-iKk9GfntxBNPxEEM2lmh4xuICqVJ/t3cf9axD8rxq1ziSBWefN5Nqolo/n+/NW1Q
-01NvDTSctzSpZXdbvoLKIVs6sfymyuwrKRTofgrcr5DxHI/KVAExHsMCmzJ+6egs
-N4Z9LW/yJP8IWn/SHB91/5GF8ScT6aNvCmFjejj3XGAu3tAOFxDB8mqGRbhjrU7Z
-zpCB9WAJZwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQUZIY9lHgdx3kH6uVmEVf8rIf4cGIwHwYDVR0jBBgwFoAUTVBQ
-oStX6af1hQq4fjCPKB07+e0wDQYJKoZIhvcNAQELBQADggEBABSCM6VkaMLc8AJ+
-3zlAAzhHnQC+Hi92dbqIoYM0skXHbni8lCPffwDf0egX/deTHHxx8Bc9F5Ew/sFb
-cFzzK5JGCcFC13AurE6bn/l5oM2zTKhLjuy6JczjYJQVQruUrL6A0ujIYIITod0c
-O1SXlsuckZbowmpxwz/3r0rR2kvKpfLSwGIiCbMnQJpmx2LNsLoMjwegmUsbS7bI
-Dg1XMfchiH07M1N7DPg0LRSXuBlE1pYvb71RlWiB0CvuqGbCdtWDLoEUJ5YzXipU
-sp029he20NuJK+DiM571D7oR5TOhKM/jv8FSQ1c8hWsQ96+9VfGHYlmYq6XQpAwe
-Ckt5Xao=
+MIIDiTCCAnGgAwIBAgIUHoERrkz+UsLdJxGsbB2FXW0bLeowDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEWMBQGA1UEAxMNU3RyaW16aVJvb3RDQTAeFw0yMDEyMjQyMjUxMDBaFw0z
+MDEyMjIyMjUxMDBaMFAxCzAJBgNVBAYTAkNaMQ8wDQYDVQQHEwZQcmFndWUxEDAO
+BgNVBAoTB1N0cmltemkxHjAcBgNVBAMTFVN0cmltemlJbnRlcm1lZGlhdGVDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO80bbNtT3GCJcSCNwkVCobd
+Rzxn3lGNPsW7IT5rinSgVHtipOwqHxj+agHilRMrxyYA0Xa28U5O/AsXxOsQkN0t
+dYu+/bHmG1P7BNJb4yWhCptLWKvtq3SbP2hWJQjVlWhnUj/3tyE/LIibJNCgHJja
+w0zy0ACzDGpsMgojrYvVF2u+y4O2/4nGmGbAGWWUavCNFCruTzJo7VMF/oSul7wn
+vxxVaeEgc8WqHaSVYvUAw5d5nFOFLO8V2ajp5Fz1Lfvc/YHkPcLRjArTSvZV9T8j
+n60GTlvxAGcHBJ+/mJbMyxboBeml0L2VCuroJgbRd/9nH7ajEKNmljZ2/Qt4f68C
+AwEAAaNjMGEwDgYDVR0PAQH/BAQDAgIEMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFHVij5x3WgNOoBuHUmfPhe1hbdGOMB8GA1UdIwQYMBaAFB6ccAPQBiiWVkW1
+hw8+pJkhbIoCMA0GCSqGSIb3DQEBCwUAA4IBAQAoIRSRgGjqBouNFHltQmr3674m
+psFt/eVRuUCQ5V/AcNUXLNY3w/NKhkULwZ87q4SoLtiqaZdKJ1GO9BHNfM6aG0HI
+40OSw/OMwq03BnQpm2POOFU+4sKXUPcKUjmsM4hlKB6nDK7+c3jeMEizCj9dxGSV
+QWrqEeMKeYemwDUiUoLPd9004T0igzAHQe5eCZ8ZLmXh8tsqkoAW+ZpZhbFIJlBI
+Me+y/vWmhlyyJfb9qhx5PidHBPYqnuVkBoYL2XoYLCYU4iEdxCa1sPZgi/mlVFV3
+q3TONbJKDNwsymgx/03kOCSZ6iIWrKBF9aZnVDlKvGzfnk4g/BlqaZMOA+aK
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIDaDCCAlCgAwIBAgIUO8QfwMrit9j2QhaBYi+nh1zvqTwwDQYJKoZIhvcNAQEL
-BQAwTDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMQ8wDQYDVQQDEwZSb290Q0EwHhcNMjAwMTIxMTA1ODAw
-WhcNMjUwMTE5MTA1ODAwWjBMMQswCQYDVQQGEwJDWjEPMA0GA1UEBxMGUHJhZ3Vl
-MRswGQYDVQQKExJKYWt1YiBTY2hvbHosIEluYy4xDzANBgNVBAMTBlJvb3RDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJdzfNL8D3PdgsWFfnNam4/O
-aYtXbtrrMdeTwSY9zikwLhhTMIo4H6CgMO0TVI1Hku16ZkQd57HON5NrRFyLOKRn
-QZWQA1rg7fIBn+0qtjElGh5Tfi6JKRbnUxTiUqfDdoh2u+QHGKWN99NqMa9QdmzH
-kDvUXkRcEP+a0c8tGPS+a01Ue2qnP+N2Rj9PMwpYmYcWb2NzIhnX9w+fobtbrdE3
-Y1prIM39MnquoUr50QrIgKPwvwzN4HbbmwAIZPgoODMwAg3EEWwEOVO4O33FARDj
-wpIaP1PgKV8/t4zht9Yamkna0nskfbGD/ocvV3ZA42UESqHY3oZ/ob22h/MdfVMC
-AwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
-BBYEFE1QUKErV+mn9YUKuH4wjygdO/ntMA0GCSqGSIb3DQEBCwUAA4IBAQAI+PA4
-zzWlh4kW2WODZdD9d8Ey6FFMpE43cLU6FXVqBVuHPfls5pp918+YgiHrr5vPCHn1
-OBcj+1BE4HkyITKtmnVJPWXnKwmwygwn7hyK3KzKGJAXJKDhQeRIrBbokGDxjpj5
-kzJg8bWMTuP3tlWur8DAbP5NoFLJni+4hbLQkyMzguBvLzA2fv85Xu0u6KUOryJ+
-NdnQt1alFsRpl1az75YcTXv5ac5GvKIhPVFC9vM8bhRSn/M39cmTbCGjc5DrcJKN
-9rgo6/NMsJU5FEML1Jty8vOSZsHFv2rDykJHArANAmjEkV2rsJHE3N+3SKuzrUiI
-hQgmZkWQiscIRv5K
+MIIDYDCCAkigAwIBAgIUQvVmd8amI67R7MF0G2PGpJR/w74wDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEWMBQGA1UEAxMNU3RyaW16aVJvb3RDQTAeFw0yMDEyMjQyMjUxMDBaFw0y
+NTEyMjMyMjUxMDBaMEgxCzAJBgNVBAYTAkNaMQ8wDQYDVQQHEwZQcmFndWUxEDAO
+BgNVBAoTB1N0cmltemkxFjAUBgNVBAMTDVN0cmltemlSb290Q0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDn4RhhH6xediUowLNXJTTTh1Oa1U4uUONQ
+eMxZBADNH6FCDi2j4OLBz9NbT2hpSumFV5rwR1SA0rRtA/nK/dOrArdMg2DE414r
+xoMZz1eYcPjbtfhPfecj7Q5rswyM4u84dw+g+DLq33Ko9iXTdp0XfUye65cq6JH4
+h0KNJ6pimSQpZcEEGkfL8/dOriZ7yYBpt9pPvz/6R79YIkFGzvWoo36YmJRm3BXr
+DariBM4RQoyAhhD3LMP1AZbHHnaqn6+aK+GSnK6qfNL53RUZ6oFr+XuY09Jdm92h
+Y1pLLeXUfNcaoK3gw/tDf6YaH5GETi47DkSXoY5QNMqeqlB6e9ILAgMBAAGjQjBA
+MA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQenHAD
+0AYollZFtYcPPqSZIWyKAjANBgkqhkiG9w0BAQsFAAOCAQEAx7cuX8D5lIbdAQKL
+q4NWrFiQoiosjW8NyNg0QI7iWmqcu+VosyE5etxIF/uXOpmICvAa15SnR8+VsEpI
+8GuYvWgx9mVo6R0UZ9DKrJGe39k7Ekgrget4CuIHhfHgfCrpP5fvIJsxW/RneWmi
+4yVHVMRUcZXfH6/kUNVY+rRblmN6CXqn7wUWp4tgjKEgOuS6R/OlxqFygEo9Jeyr
+n6otd7MzXyl2JudD63sv9I+WkGLaCSb+5dVd/i8BjEjTAGkGUBw0YU1UMdqHuiUk
+lQvFZ8YLBZbWjXpZlhVg7hjenHL1v1ThhoUMgaGCoEYS4bOnagWq3RJhrcqzAmir
+pVB/mQ==
 -----END CERTIFICATE-----
diff --git a/systemtest/src/test/resources/custom-certs/ver2/chain/strimzi-key.pem b/systemtest/src/test/resources/custom-certs/ver2/chain/strimzi-key.pem
index 87687479ce4..0ab6c51ea2f 100644
--- a/systemtest/src/test/resources/custom-certs/ver2/chain/strimzi-key.pem
+++ b/systemtest/src/test/resources/custom-certs/ver2/chain/strimzi-key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/systemtest/src/test/resources/custom-certs/ver2/clients/clients.key b/systemtest/src/test/resources/custom-certs/ver2/clients/clients.key
index 453c5220442..5dd1b404463 100644
--- a/systemtest/src/test/resources/custom-certs/ver2/clients/clients.key
+++ b/systemtest/src/test/resources/custom-certs/ver2/clients/clients.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDcsnYy/lS1+oU2
-WZYwUlsH7Ho1vtEIbeImYZRTeVru95xMmgyflT7tbY6i6Rd17CnkC9NUNGBG+7jG
-K9MRZA/lNgiCah+1kQBg1vVoi4Zp6pJcYUZ4AuEBD5swsFq72aZW6EhVWKl9dxL8
-fSJqe7ThZ5UAMiuHbrs+0FBOkUONzOehqfnV6bOrFjs0ZJWyGkIjk1dM4kmE7l75
-4CIWc3EZDvA6Bd0lZxQMrPajdbkjS36OrEUULWCWWae1gENv19UNIcfV5O+kPjGy
-J3Qeg0rfxpK7ajkWzOh1kRF0JpcOG6WLssUu0FsXtbxqLvvtdjU4CJQLUSaOf7VT
-Ujomvsn/AgMBAAECggEBAMRcLHp2e1xmh3ux/cUEoWXNa3bCTi3Xxq0riNM0WEni
-GTi2n6ClI5YQMiaUiYEsHKGAPAjhiP/fG6mGeIcypknj53JRheEAIHwJBdR8v50h
-ThPPoOlKdnOBNSz+29vjbPJKPYFiH3s4JLZth9+CLY+Xn6TK/pvDU+oxYiJlcNuJ
-21D1zI1/yLRSyOciTy4ePyK40J/d/s0QzAUE0uOwAeLgXn5dRpQ43MmFFW+jwitx
-V5c6uOumCZrFG1PvgHsjd8gPuTbOaNGg1hoKOhAWkE3dvyVcdqlc+96a46TWmXmx
-/Pgwr9NUZmLtt4J3YcK3xLVFgsVyEoxOdfPAq+HK4mECgYEA6jINMiJdLGcTMvuV
-RzNjrq4CVZqqc7QD8wYKsONqUx2yU/mFuiGk6fUoPfGtz0YK9vYQXJcES1azX/YH
-NFoME6tp0H5KG5aVAV1J66gQR06DlwBFGuxIh8Ja7gQrnOujjlduIIr44qhzmjTF
-FahGE+Fcns3a1ydlLsoyPBFch1cCgYEA8T6uhOa2W8iMnp4JYWgYw7slAedmWimI
-JxGs7buvXPYuF9zgUODU2qARJXLPQUd5SsUgJOgvBaIRmxSfwOG+klQIIMIbZXX6
-AdNHbWP7FgXBHyx2CA6hnKW61uFNbRJ23gGWc9HKNEF5vVXu7Ohy5F6yPqakVGE1
-Ffv5I8Sf8ZkCgYAX96VYEyI78BSL7ClbzwuNjetZPWniS3L4BQ9FCRERjoF4jJm9
-8cGB3AARTtF92+o1WftUrnPXDflvgas9FVYVET7UAoitCB0ZtaViA6Ie2g8nffSU
-i8fkdOR/ZVfdSFRFtfbkR7Su5ZRnHK1qyPza/f5PljumNzbosfKwKQqyIwKBgEUZ
-wztmKk3YAA9fDSjNfGp0LIGDGpow00L9mR7vZ6elDEbhiY8hF1cYClFDtYHpSyDT
-ngV0TCO87HYTTj8dakzXrQxVDSvewyHKtubqgH0qYMrhHV3pcvk/r2jlWBwp8cpd
-gg7ixJx7NLe66ZkKa/5l8YBokyFoRqBpcE+Cfp3hAoGBAJQqsvBbmlM8BRPwmLAZ
-q/OABIQUETixHldprQ6Q6ifEfQ8v3Hp3DoX5voCRQvzVcbOcYbrK5qILdOSJojpX
-Dy05exPsGXJWq1TyPaeb6yd/sdVdm4vB+MJicalBy1zDDurckl+n0JRaljL4m4ZE
-jVu5ktu9lfBCyXNiRrPnGfLo
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDCbx1I4McIfzLc
+0mboazTxE33ydWx7SPoJeOB0TWtyKd4z1nzGDlEpFBbCl5xA6pDW37dZ1wWYrSsQ
+aOvcGEqVkffjkXJEagS0ABzubx32Bbz5FmkvyaINk2PCSAcYsNK/XTfBOxLqVbO+
+qGh0QP+Ylh/NTyEvyUG2uaTgracxlg1FZWAw+inWeLFoFksBHT1Y4cu3ZrSFDgAu
+t0EFPmbt/YRtc0jqMCE7dFEZ4xq/DUoCgHB6QiBWm5o2oVY2Y5/mAuZJCyOIXA7v
+mcnJkwlqhQnG6MFKr9zsInehMHrhBI7S07tHD6cp3++C7NcRENAVAkuLSTADKm78
+dOiArPHxAgMBAAECggEACqFGiZh4aTeDEV2TcLuDvnZhWWMgFjFsMh5grxsYd7pg
+QpdEZROdTlCh2euuCEKKvqSmgovl6230P8ZstrDBSyIa2l82TxU4wpqK+mIq0iuI
+JFocUBeG+5UGTDXh5XCtZPb0uGTBaPxcglz0sP5ouu/iNzhPSSyIojPOFtaHoIdK
+GZQ/FjRVn+yKv5dfTPVRdhlfKUcq+1TWCGJ129AEhZUohKh/KBR6pw/xCP7d6Ono
+5rN1IQ0hRQrtRmRyga/Az+4k+Mrm2QQySu1nZi8j1bzZxsPZKES4D7CXhG4hwE0D
+M9F/N4xu6/vZH/Z/WgBv7kny1DT/F3k7pentBo98DQKBgQD19USxI29Uez/8nINu
+Miw4r35SiMMsc7XkZjcsmJmqcMgG8bcn44dRqb4etY7sXtBWjRBvVxsn3/O6o1RF
+a/zH86gJopp7gE2f5digIP++rvCNcNpiRfCw7lzboRJdRAvHBJl5OrTroWkv3Lfx
+5FYLHkoPQiuKIDcM/bYjUofr+wKBgQDKX1JK/iaadtw0LanyuC04JW9i/JnwWM5C
+IqISZ4IPU5PLhKo1a0jyLtsg9oT8vCI+FCuj7p57IWdVKCXrRUZMgHgXYqT7fTqR
+HDW+TQLkpD0jjZkzf4EPPWLIAtuVi1dFWknCgmmPa2aX7/ftWwsVE7yDlIGnkVVU
+exiV2LoqAwKBgF0CfhJ6cuxAm2bcjPsL8BsTijKN0zipHRyc5rpvjpSch5fQqlFk
+QlTIWsPkJoMOK7y/JXrlNriygMmQYBrMhk/avS2/lqmjUDdqRKvxLqUeJItoJL1K
+84UE7oqDc51fURDWlW75m1cLt+pIjirkDQGxV5JDlJFsM0UvYEQlPo8nAoGAbYTW
+mUUfiRpoI0jPH07zEd6YgD5p5Lt6rCnoAgPITBkT8+EQ6CXubTpUVmtzHv+FnIj3
+8Riy5bn3HQvEMaXk3IPt+eHlnUBxUJSutRUiSrBjcfkwfsEzDBdRfSKmyTCGgz7Q
+ihZfoEEkXXd9ehN6VObAb4kP/apWPoj7jiSi4xcCgYEA4VryyWp6xQXrYog7j28d
+dZt1dSxn1r00fGPFyvmzr4vxRmFfHEjUA6YfdpIeHBuYRkULDFkonesM5GinjXMP
+bbh+l2EzzupSRq544kMDT28G1u555J4VF9Esh+WVJrjpL7o+n40UbJpOJpgDoBWq
+/cRux0B3rQbS5ea5T4e8TE0=
 -----END PRIVATE KEY-----
diff --git a/systemtest/src/test/resources/custom-certs/ver2/clients/clients.pem b/systemtest/src/test/resources/custom-certs/ver2/clients/clients.pem
index 97e2b046980..f49dc76fd92 100644
--- a/systemtest/src/test/resources/custom-certs/ver2/clients/clients.pem
+++ b/systemtest/src/test/resources/custom-certs/ver2/clients/clients.pem
@@ -1,22 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDlDCCAnygAwIBAgIUZKtJKZ3yyVlXiPvnDq5oDD1kGJAwDQYJKoZIhvcNAQEL
-BQAwVDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMRcwFQYDVQQDEw5JbnRlcm1lZGlhdGVDQTAeFw0yMDAx
-MjExMDU4MDBaFw0yOTAzMDcxODU4MDBaME8xCzAJBgNVBAYTAkNaMQ8wDQYDVQQH
-EwZQcmFndWUxGzAZBgNVBAoTEkpha3ViIFNjaG9seiwgSW5jLjESMBAGA1UEAxMJ
-Q2xpZW50c0NBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3LJ2Mv5U
-tfqFNlmWMFJbB+x6Nb7RCG3iJmGUU3la7vecTJoMn5U+7W2OoukXdewp5AvTVDRg
-Rvu4xivTEWQP5TYIgmoftZEAYNb1aIuGaeqSXGFGeALhAQ+bMLBau9mmVuhIVVip
-fXcS/H0ianu04WeVADIrh267PtBQTpFDjcznoan51emzqxY7NGSVshpCI5NXTOJJ
-hO5e+eAiFnNxGQ7wOgXdJWcUDKz2o3W5I0t+jqxFFC1gllmntYBDb9fVDSHH1eTv
-pD4xsid0HoNK38aSu2o5FszodZERdCaXDhuli7LFLtBbF7W8ai777XY1OAiUC1Em
-jn+1U1I6Jr7J/wIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUUSrkYDL0kVI4ja17U3KnVGpBhXowHwYDVR0jBBgwFoAU
-ZIY9lHgdx3kH6uVmEVf8rIf4cGIwDQYJKoZIhvcNAQELBQADggEBAFLDNE2OLuja
-mHol+SbAhRs8ph89ObSgyOVaCuM1lo+3z6PVfYdGV32S12FUv8SOydBXU8UCOGBf
-fM6IfJp6sQvKAyXKL/0zcd7Kvi1IENCzjGobMR1yz1LiMZ0cd8Y12EyLmUW0cIrZ
-ix/eATjz423qynWX8vEVA1pcwIDvsC81rbi92omi6/HaGJG/J6TjOaBn6KABQAQl
-a9xp5UqJdbT4zGyIjRuMZXbtToM9xzVIH6lwdDxiYC1YKP8uQtBQA1MlypJukf5Y
-7k0ZWHYdOuPrpVFIZyw3ooIpGWUpTOaSDJ4z4yl5uepDDB3cFoqprLdseHgb+nyB
-rCGb46BtvnQ=
+MIIDjDCCAnSgAwIBAgIUeVpKAvFuhTs7B7T62lK2ozJoY7wwDQYJKoZIhvcNAQEL
+BQAwUDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEeMBwGA1UEAxMVU3RyaW16aUludGVybWVkaWF0ZUNBMB4XDTIwMTIyNDIy
+NTEwMFoXDTMwMTIyMjIyNTEwMFowSzELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlBy
+YWd1ZTEQMA4GA1UEChMHU3RyaW16aTEZMBcGA1UEAxMQU3RyaW16aUNsaWVudHND
+QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMJvHUjgxwh/MtzSZuhr
+NPETffJ1bHtI+gl44HRNa3Ip3jPWfMYOUSkUFsKXnEDqkNbft1nXBZitKxBo69wY
+SpWR9+ORckRqBLQAHO5vHfYFvPkWaS/Jog2TY8JIBxiw0r9dN8E7EupVs76oaHRA
+/5iWH81PIS/JQba5pOCtpzGWDUVlYDD6KdZ4sWgWSwEdPVjhy7dmtIUOAC63QQU+
+Zu39hG1zSOowITt0URnjGr8NSgKAcHpCIFabmjahVjZjn+YC5kkLI4hcDu+ZycmT
+CWqFCcbowUqv3Owid6EweuEEjtLTu0cPpynf74Ls1xEQ0BUCS4tJMAMqbvx06ICs
+8fECAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgIEMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFAXIZUgzWsKIDykjbP3N0j/LysQTMB8GA1UdIwQYMBaAFHVij5x3WgNO
+oBuHUmfPhe1hbdGOMA0GCSqGSIb3DQEBCwUAA4IBAQBUH7U7t31Mgt+r0CqpS1MO
+dnMkra+Kn4dsD+vFXW88zaYXT+iQmo5ARX3Zh9d3MEpglsUGDe3p7zxZItRk45hO
+kGQyUEsmzme3per/dQuU8hJbgSFD6oQvtXELYxQ28jb+ElNWcPI1AKUt5CflO+uA
+C2lcwo1soGSWcfbFLIQWAMB4a4vgwGeGOG3iX4MYRcCkxFKeawFgENlq+zku/Wwo
+nt1cBw/ciMQdprGRnsD0H+icv3GXWmRveGCFvTLqw9g/A07LR8ePOFFcVh+ztMBv
+gUa//Ozsx13M3KDICmBXuNYCzp0hmbUD/xmBFDW9CDggAzw1jSS0fsLptvKSxZOW
 -----END CERTIFICATE-----
diff --git a/systemtest/src/test/resources/custom-certs/ver2/intermediate/intermediate-key.pem b/systemtest/src/test/resources/custom-certs/ver2/intermediate/intermediate-key.pem
index d74a57a415d..f9abd0974f3 100644
--- a/systemtest/src/test/resources/custom-certs/ver2/intermediate/intermediate-key.pem
+++ b/systemtest/src/test/resources/custom-certs/ver2/intermediate/intermediate-key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/systemtest/src/test/resources/custom-certs/ver2/intermediate/intermediate.key b/systemtest/src/test/resources/custom-certs/ver2/intermediate/intermediate.key
index e6775d582e8..f1c0af057ba 100644
--- a/systemtest/src/test/resources/custom-certs/ver2/intermediate/intermediate.key
+++ b/systemtest/src/test/resources/custom-certs/ver2/intermediate/intermediate.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDUDRVT6UMNLQdK
-8QoBf4dAGIBOSJLHreDlOwRXKq0lo4nsiCHrYdQWzQpep0tPxUGt8OxAgoic4zx1
-etbvhzoLLC2xAvuNwZfw0bn9JXcmVlvAIKc1hixRLWy8jc/NdsHivDrJVvnfYtuI
-qT0Z+e3EE0/EQQzaWaHjG4gKpUn+3dx/1rEPyvGrXOJIFZ583k2qiWj+f781bVDT
-U28NNJy3NKlld1u+gsohWzqx/KbK7CspFOh+CtyvkPEcj8pUATEewwKbMn7p6Cw3
-hn0tb/Ik/whaf9IcH3X/kYXxJxPpo28KYWN6OPdcYC7e0A4XEMHyaoZFuGOtTtnO
-kIH1YAlnAgMBAAECggEBALnkLko9NtaaHsaHv+nITlzWHcSCwonh2EGcFxYDB37z
-ermsLXAXdsH2RZzss4zes9E0Xye+RtyiKCIk6b9ZoHyi4ftHThbbG8O1V4KgEW++
-TPiEp5C4aqlPVP+GoiDQdu+5ax+N68b09tc65aGcA9/bvhWhoQ7ZfJ2HSR9r/w44
-/g5vX6vEPFAdqxcevyi1YNmI1HiqgSeC7Mrdcgbnqu3NgxV1f/nDrznKdF7cMqwz
-UmxaD0W3UALSrbbqEYyo9FfbvWm8LfGDWpcSAJ6gBlEzeZFhZgHUNeQvgz6F29l2
-7aSntrq+WT28t2fTSg9mtWd28x0NDqxX3MaPTgaiLYECgYEA/5iJLOyO5RrAzV+p
-6/le6NnwKDW2E7NM4GJR3tsemVUFRWGs/gIklp6usJyPYNU2/fuFuBp5gNaGjhMc
-X6+rXx/fOrXhjnQwcPs8/Bp+dzEPzWLT4KoGS7IimOl7GixCTy+jyjj2tBnDrltQ
-tue/rTGPOUD5sshFnJwQ1RHl5jECgYEA1GLrtXWUdCLX4iABFZjrTwDtvuWzwbUe
-nq+Fb5hC0EJL+cp3n2tBIGWhw6pyfR86TpAfHbX49aNO7xZkSEQTp5uKcYQii8RU
-6sKaWnKQWv1ffRtgexnBOZfk2WWrHAR7qu8Ejppxdao2B3iqoCkOpiX8bGNVdjsl
-9zYLlnnISxcCgYEAlf2yij1sAcB4Yk0AT20wqB600zPp3Je8xnSMLOaTh1GgXT3b
-odgqFoWaaCQH88BLnDJNH2PR56x8m8VVQkW5oIH4ouB3M/y1LKgS+rKlgla1OkcD
-pXTBawxnRyrExfAxHX0MdjCFfd0cuyX1MNDA5+cMcIHTxnnGeAgRzKfLLRECgYEA
-0UGBkXD+yopGABKeXuQi+90jYZG6UWGdgKXZJ8FyGvUnHD7DK7wmF8Bq6Hj4gpUR
-ArT3I3PWjlbP/7slJRqF7v7OIdgZnXHcZM1F/VWhKzU3LvGZVtBiU9d3cEa+l0VH
-f3wuFj7PCSqiPyxBmLm7KDKHCVe5rVrLpk2Gj0T/9hMCgYEA98IImbMNDRYE2Q4F
-v7gz/vdrMamZXrVg4OiE+qG6tm6KyKvkMmgRMWbEPgF4wclMAE8TOqrRuqfeU34c
-ovkFGm7KVnqx6oF9HTqelifv9G4FuBx0eL5erLHKitCODN5xBhP7hOSGP4+1sMAe
-NXEHOhB3BoL9v9MTbfGiDIsnLtk=
+MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDvNG2zbU9xgiXE
+gjcJFQqG3Uc8Z95RjT7FuyE+a4p0oFR7YqTsKh8Y/moB4pUTK8cmANF2tvFOTvwL
+F8TrEJDdLXWLvv2x5htT+wTSW+MloQqbS1ir7at0mz9oViUI1ZVoZ1I/97chPyyI
+myTQoByY2sNM8tAAswxqbDIKI62L1RdrvsuDtv+JxphmwBlllGrwjRQq7k8yaO1T
+Bf6Erpe8J78cVWnhIHPFqh2klWL1AMOXeZxThSzvFdmo6eRc9S373P2B5D3C0YwK
+00r2VfU/I5+tBk5b8QBnBwSfv5iWzMsW6AXppdC9lQrq6CYG0Xf/Zx+2oxCjZpY2
+dv0LeH+vAgMBAAECggEBAI6xkOtjPuvwfoUuRJR3Z9Mx90fSkm3Fu3eK/PbWgj62
+Ug9UthtnuStYwXYka1eHWwKRpGKUGXjkZzha0o6DUFeQwbk+kupn4U+Ew8iVJfiR
+i9k95kSRwCEMZ5PfJ7KQbtNcJ1WfeTAtFmzbV+fYS5bnkW+6vVhddv+ZUXR4+hMa
+QNg2019/VmEtN8pqK5ahTQoql12X+MpyQK6J30yEXuY/vpRFIYqUl5jHb1Ztj8lT
+eqz5/7hTlGYHakx2tlf0D9HeAwQ5CugGPvrcY+aFc44s12E6q2jVmUCLdELtjQSy
+3hZywqCxDb65u2BHzV/Gtcs4w8Yc5ZQ4n41b/n6/CxkCgYEA+9b6upfS7JeVPvB1
+el47BaOjfy8keCmCJCkZhzI4eXdveoZ/+A2Jc432h4zcEjxf+d0t3BsI3mIlZjHW
+L8vUZzDT6B5Jop78y0RuWttqF69gwjfpRnxtufw8IZ4XmpzJb4wFqEHIci1i9R2u
+ViPdD+A6a5M9Oh2cdxpYlLUJhLUCgYEA8ygELoezFN/Y9Me0dX6+DKy4ihRk6Snz
+IoBmyWGJk50ioXN6PkL/zYhPHgN4muY/T+ws4NkTuLfiHW+yd2+AKI0J5x/2DNQb
+N7ixcQhFGL1adtjz53gz2hpt0bJ71pgqMjIG3V/dA09GLkdQoMnXjUUXYFlS8Sjj
+u5qvNt/lNVMCgYEA2eyK5MKSY+c7383marB19IhI57rcnRqWIkJqc8IyenGuxuDy
+haz5H0Rea6epnCIgjzAlCg1e3Ekjwc4oYQ3JzE3FYVwsLgvUBvU9ZWPu53X8jbQi
+Kbtsm/837YNHO6Sm7t7E2neqQ5sgwakgfivklGNdSk+MMOkEx0/GDVCnXu0CgYEA
+5pUYAhflFvJ/hwCqfJFIIDTaevaECyggzKL+1hGMqVLluD0Nu2VFtt6ASHH6OMoH
+V/8bP84bCZw27LszfldaLRoyPd7tMZUiimC2w/2XqLJHy1RJV0OByF4vrh+XmBSM
+TzVplRyHNdBDOTefmhpOMkVGubN7F/4yl4FEjsEbVskCgYEA+RNuCWaFDjYKHf+L
+2AtSH3Jh3IwUA9VHTjkflxlybBadsQqriNpnbA9AqLhM0/7ABVLG6RQcsbRyPy5G
+ofLtNFExpm3qZWaLU3EZciNor542lYACPNMIGmss9aFyknb+KesDZEcpCMJ/q1L2
+JOltd75tKkzUDZoEHQrIsX9iwSY=
 -----END PRIVATE KEY-----
diff --git a/systemtest/src/test/resources/custom-certs/ver2/intermediate/intermediate.pem b/systemtest/src/test/resources/custom-certs/ver2/intermediate/intermediate.pem
index a6152a6212f..3b3f8004fea 100644
--- a/systemtest/src/test/resources/custom-certs/ver2/intermediate/intermediate.pem
+++ b/systemtest/src/test/resources/custom-certs/ver2/intermediate/intermediate.pem
@@ -1,22 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDkTCCAnmgAwIBAgIUHA+NE4E1T0MvykD2sHwPS74TRTwwDQYJKoZIhvcNAQEL
-BQAwTDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMQ8wDQYDVQQDEwZSb290Q0EwHhcNMjAwMTIxMTA1ODAw
-WhcNMjkwMzA3MTg1ODAwWjBUMQswCQYDVQQGEwJDWjEPMA0GA1UEBxMGUHJhZ3Vl
-MRswGQYDVQQKExJKYWt1YiBTY2hvbHosIEluYy4xFzAVBgNVBAMTDkludGVybWVk
-aWF0ZUNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1A0VU+lDDS0H
-SvEKAX+HQBiATkiSx63g5TsEVyqtJaOJ7Igh62HUFs0KXqdLT8VBrfDsQIKInOM8
-dXrW74c6CywtsQL7jcGX8NG5/SV3JlZbwCCnNYYsUS1svI3PzXbB4rw6yVb532Lb
-iKk9GfntxBNPxEEM2lmh4xuICqVJ/t3cf9axD8rxq1ziSBWefN5Nqolo/n+/NW1Q
-01NvDTSctzSpZXdbvoLKIVs6sfymyuwrKRTofgrcr5DxHI/KVAExHsMCmzJ+6egs
-N4Z9LW/yJP8IWn/SHB91/5GF8ScT6aNvCmFjejj3XGAu3tAOFxDB8mqGRbhjrU7Z
-zpCB9WAJZwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAgQwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQUZIY9lHgdx3kH6uVmEVf8rIf4cGIwHwYDVR0jBBgwFoAUTVBQ
-oStX6af1hQq4fjCPKB07+e0wDQYJKoZIhvcNAQELBQADggEBABSCM6VkaMLc8AJ+
-3zlAAzhHnQC+Hi92dbqIoYM0skXHbni8lCPffwDf0egX/deTHHxx8Bc9F5Ew/sFb
-cFzzK5JGCcFC13AurE6bn/l5oM2zTKhLjuy6JczjYJQVQruUrL6A0ujIYIITod0c
-O1SXlsuckZbowmpxwz/3r0rR2kvKpfLSwGIiCbMnQJpmx2LNsLoMjwegmUsbS7bI
-Dg1XMfchiH07M1N7DPg0LRSXuBlE1pYvb71RlWiB0CvuqGbCdtWDLoEUJ5YzXipU
-sp029he20NuJK+DiM571D7oR5TOhKM/jv8FSQ1c8hWsQ96+9VfGHYlmYq6XQpAwe
-Ckt5Xao=
+MIIDiTCCAnGgAwIBAgIUHoERrkz+UsLdJxGsbB2FXW0bLeowDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEWMBQGA1UEAxMNU3RyaW16aVJvb3RDQTAeFw0yMDEyMjQyMjUxMDBaFw0z
+MDEyMjIyMjUxMDBaMFAxCzAJBgNVBAYTAkNaMQ8wDQYDVQQHEwZQcmFndWUxEDAO
+BgNVBAoTB1N0cmltemkxHjAcBgNVBAMTFVN0cmltemlJbnRlcm1lZGlhdGVDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO80bbNtT3GCJcSCNwkVCobd
+Rzxn3lGNPsW7IT5rinSgVHtipOwqHxj+agHilRMrxyYA0Xa28U5O/AsXxOsQkN0t
+dYu+/bHmG1P7BNJb4yWhCptLWKvtq3SbP2hWJQjVlWhnUj/3tyE/LIibJNCgHJja
+w0zy0ACzDGpsMgojrYvVF2u+y4O2/4nGmGbAGWWUavCNFCruTzJo7VMF/oSul7wn
+vxxVaeEgc8WqHaSVYvUAw5d5nFOFLO8V2ajp5Fz1Lfvc/YHkPcLRjArTSvZV9T8j
+n60GTlvxAGcHBJ+/mJbMyxboBeml0L2VCuroJgbRd/9nH7ajEKNmljZ2/Qt4f68C
+AwEAAaNjMGEwDgYDVR0PAQH/BAQDAgIEMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFHVij5x3WgNOoBuHUmfPhe1hbdGOMB8GA1UdIwQYMBaAFB6ccAPQBiiWVkW1
+hw8+pJkhbIoCMA0GCSqGSIb3DQEBCwUAA4IBAQAoIRSRgGjqBouNFHltQmr3674m
+psFt/eVRuUCQ5V/AcNUXLNY3w/NKhkULwZ87q4SoLtiqaZdKJ1GO9BHNfM6aG0HI
+40OSw/OMwq03BnQpm2POOFU+4sKXUPcKUjmsM4hlKB6nDK7+c3jeMEizCj9dxGSV
+QWrqEeMKeYemwDUiUoLPd9004T0igzAHQe5eCZ8ZLmXh8tsqkoAW+ZpZhbFIJlBI
+Me+y/vWmhlyyJfb9qhx5PidHBPYqnuVkBoYL2XoYLCYU4iEdxCa1sPZgi/mlVFV3
+q3TONbJKDNwsymgx/03kOCSZ6iIWrKBF9aZnVDlKvGzfnk4g/BlqaZMOA+aK
 -----END CERTIFICATE-----
diff --git a/systemtest/src/test/resources/custom-certs/ver2/root/ca-key.pem b/systemtest/src/test/resources/custom-certs/ver2/root/ca-key.pem
index 6131c8c2248..17b703ac212 100644
--- a/systemtest/src/test/resources/custom-certs/ver2/root/ca-key.pem
+++ b/systemtest/src/test/resources/custom-certs/ver2/root/ca-key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/systemtest/src/test/resources/custom-certs/ver2/root/ca.key b/systemtest/src/test/resources/custom-certs/ver2/root/ca.key
index 5f2185872f3..9cfce91a81f 100644
--- a/systemtest/src/test/resources/custom-certs/ver2/root/ca.key
+++ b/systemtest/src/test/resources/custom-certs/ver2/root/ca.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCXc3zS/A9z3YLF
-hX5zWpuPzmmLV27a6zHXk8EmPc4pMC4YUzCKOB+goDDtE1SNR5LtemZEHeexzjeT
-a0RcizikZ0GVkANa4O3yAZ/tKrYxJRoeU34uiSkW51MU4lKnw3aIdrvkBxiljffT
-ajGvUHZsx5A71F5EXBD/mtHPLRj0vmtNVHtqpz/jdkY/TzMKWJmHFm9jcyIZ1/cP
-n6G7W63RN2NaayDN/TJ6rqFK+dEKyICj8L8MzeB225sACGT4KDgzMAINxBFsBDlT
-uDt9xQEQ48KSGj9T4ClfP7eM4bfWGppJ2tJ7JH2xg/6HL1d2QONlBEqh2N6Gf6G9
-tofzHX1TAgMBAAECggEATzIGzdUcx3vHjD4YN33j5rkLG+Amibd/IrmSwMqE6ajW
-EcY+lahvcXES5IW9KvuIa0IcA/aXV7T7/sySvMnYXq/X7buW5YjFJE2RMVWqW9yI
-4d7LFs6GfAGOwlbu3ecqLoXYDo9fZgLs2tKnFIPAyXU5iO+uM5TpFqAAopN0f1Xd
-m8gTfKDHSGntNwh/VYBKpakvpd6xvoHBea9RyY4Z9rLFW/MrtAOe1Oo2SzLAFqAZ
-n2QaeGsfflnNg3i8pORaSp6pm4jnFjaUwq1JTqcOnB6QpptAexTg8S8RGlcn9Cox
-V8d1Hfyl4PJe5e3eQZKVvWYRYgamaXPxE2M0cjJEwQKBgQDEIpx8GHnPsu4klxnb
-Wv2ed+oWovovbm7ljp+OSDNxz1xddUMqs+3EKo+miowvJXVClX8JUibQ5SnTjHBH
-vM99X48FlqQfckNSdxWHQBlKXsycRgIRQPJSuK5SQD3BCt3qnxTAmPEXfL9hjA6H
-84uG6v5eLohG6kzpMpLCMi+20QKBgQDFrWchsW8hgXQk783KFPs2iVcgJoqM41mm
-djFOzPai+BBy3QoksP20nhIyVWOVPwJ5U/Ksr7grANMkPEilgQUpF8dheXOe2uO8
-Kxnd+CLtRz6SK+n9462UoSjXmJ/SywqvYiiQU5VklKb5GZIOR0j5sTqB2f+ZJfGn
-BhDBPwTC4wKBgQCKgo7ULEzJ2ujGulauTGHTKYgNGGdqW6jBQKl5R4/dDb2C2q7m
-V07QO+ZajHlXSjK3JPAj2vpCh7O0C/e3EaXOOk+8eJfLBVx5vlNbwm6Z0Lzal64a
-FS2MMZQZzfhOfageat2y7c9E8PoOn2QbqmicjRO5206uFgTeorJ1pg+AIQKBgQCv
-tn6Y/Y6qOtcRyjOj8NiI1rYidv/rUmArTp5vzFNj85szbvYIPWeXeHb2VN6rGJJL
-ZOquw5eyag5FBG0S6Me8ik2JgJrc1vdeGPXqUBpDznN5HR3mt85g8oxKcHmIt0Et
-OtSRzipaeKSfgjJJDOZ6RSabrDq+WHMgo4ybKjhCPwKBgQC5lvVI252aTuPIjh0z
-yhrasMPS0frFJBI4IIOrAXjOmdyq0YJh3q09i12QZfrXzEyXVHG8SokjaYaMjmIG
-Rz667+l/lCMVfY6rTxANT7yBeq8PnAiG74ELyflICFOLeS14yfnx0d233T7OVgyL
-K3sf6V4nPJM51JgEIuC8DUkOnQ==
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDn4RhhH6xediUo
+wLNXJTTTh1Oa1U4uUONQeMxZBADNH6FCDi2j4OLBz9NbT2hpSumFV5rwR1SA0rRt
+A/nK/dOrArdMg2DE414rxoMZz1eYcPjbtfhPfecj7Q5rswyM4u84dw+g+DLq33Ko
+9iXTdp0XfUye65cq6JH4h0KNJ6pimSQpZcEEGkfL8/dOriZ7yYBpt9pPvz/6R79Y
+IkFGzvWoo36YmJRm3BXrDariBM4RQoyAhhD3LMP1AZbHHnaqn6+aK+GSnK6qfNL5
+3RUZ6oFr+XuY09Jdm92hY1pLLeXUfNcaoK3gw/tDf6YaH5GETi47DkSXoY5QNMqe
+qlB6e9ILAgMBAAECggEAfPXLY5vkEkvtHpcqjs4YN9536bsGFOO2fMl8poQHwoNH
+LgfiBKzOxs+vAUg75nJegmOBtfdazMnAPfekiAZeKYyfJ3atka1ONJ0YTbJ1bEuF
+cTIRjRU2mR/JY7TsEIjDjlRrcb4QAo9EhVWRcPI9GkmGHyarIo6PC7Yo4VT894C1
+J4l5ZfzaH1w+fUqfBjKGAW+F4TL86km+Voc2ojBVcLoiXWyW8rdTDFm4sRmfes0D
+9K+JkyLlb6Dw/g3Mv+pV4LWKgdDJM/o29xLo0ftzprS0cCFaZY/hKI61GnNwXCoY
+NJ04pBvK7/sBWwCuRjov15Yqh2trYNVnVbHNScDyQQKBgQD+kQzpjH68Y9a+FvZl
+nbCWbfYE1eW4pDJfP+iaCeOE9LXuyU5kNgpTeBb67zt0sG/8HbvC5V5nP4g5lrZA
+NyeJOZrrHdgHFo3Zsj553dG2vD9H9LVtaNjXY6jJMjkzvZ5aoiBYrR5PHmK7EfOl
+ruhZW4q2pyAXfClr1UxVkhqcOwKBgQDpL1d8lx83/YBpftw9XFMhxINXyHIFMFB9
+MBcdA8fS+91NiIYScrwPOg7RJ5xcdoVOBX392oL9JEzAsDSkPOF8TpgoqdTxEkcf
+T2fARIvp+DHOl4l23hnpz0OBrc4+fohmtK6RlgUKKKLYSZTEil+KFeCFnwxaT6dI
+YYhKEFTUcQKBgHNAam8ma46RSPzg2ochAHzqpdKEoK+ary+OeJmc1oQwYloMi9A0
+4zHtEcJkIy/uXZTwRTy0qavnCJ7CDBtAnUa0bN37sf1riadA2qZD9hlcWu4R7T3u
+lRXXCeilM16of5QbCLf9ENbTM/Hr67pcWNdz6XZObeoUDZDDjf7D2gZXAoGAYftk
+lZOiqJI6rRmDTb1HqT67ud0eHBQLHi9g5u45vuvaN8QQIhxX7UYGB9jPGQMsTHZ+
+VHbG57ujDKx90i1KykL0KNIECjAV9pAVFnM3H18M/rQqLOpylQ5kXU89BIGCqzVs
+zPvurjAZDS0N9+/06T78Eumb9S7XKdDhxc1K9+ECgYBYNuiNAmyuoCWHUlKi4+/9
+pgRuehZPvUAVpSIWQgLuCMQ0Bap2ZhbyAZCSiCrdZaO0IJFgA6dMyxlgwVFB9fab
+2gPaVdazjfqcfmkQqZ4HTKoGybzFpO4y/ySGKhkqegtKByHN82FOvMlg8zi/tdmc
+jVcf0v0hTqmneuDYzj85qA==
 -----END PRIVATE KEY-----
diff --git a/systemtest/src/test/resources/custom-certs/ver2/root/ca.pem b/systemtest/src/test/resources/custom-certs/ver2/root/ca.pem
index bf094377696..cf0eef8d376 100644
--- a/systemtest/src/test/resources/custom-certs/ver2/root/ca.pem
+++ b/systemtest/src/test/resources/custom-certs/ver2/root/ca.pem
@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDaDCCAlCgAwIBAgIUO8QfwMrit9j2QhaBYi+nh1zvqTwwDQYJKoZIhvcNAQEL
-BQAwTDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMQ8wDQYDVQQDEwZSb290Q0EwHhcNMjAwMTIxMTA1ODAw
-WhcNMjUwMTE5MTA1ODAwWjBMMQswCQYDVQQGEwJDWjEPMA0GA1UEBxMGUHJhZ3Vl
-MRswGQYDVQQKExJKYWt1YiBTY2hvbHosIEluYy4xDzANBgNVBAMTBlJvb3RDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJdzfNL8D3PdgsWFfnNam4/O
-aYtXbtrrMdeTwSY9zikwLhhTMIo4H6CgMO0TVI1Hku16ZkQd57HON5NrRFyLOKRn
-QZWQA1rg7fIBn+0qtjElGh5Tfi6JKRbnUxTiUqfDdoh2u+QHGKWN99NqMa9QdmzH
-kDvUXkRcEP+a0c8tGPS+a01Ue2qnP+N2Rj9PMwpYmYcWb2NzIhnX9w+fobtbrdE3
-Y1prIM39MnquoUr50QrIgKPwvwzN4HbbmwAIZPgoODMwAg3EEWwEOVO4O33FARDj
-wpIaP1PgKV8/t4zht9Yamkna0nskfbGD/ocvV3ZA42UESqHY3oZ/ob22h/MdfVMC
-AwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
-BBYEFE1QUKErV+mn9YUKuH4wjygdO/ntMA0GCSqGSIb3DQEBCwUAA4IBAQAI+PA4
-zzWlh4kW2WODZdD9d8Ey6FFMpE43cLU6FXVqBVuHPfls5pp918+YgiHrr5vPCHn1
-OBcj+1BE4HkyITKtmnVJPWXnKwmwygwn7hyK3KzKGJAXJKDhQeRIrBbokGDxjpj5
-kzJg8bWMTuP3tlWur8DAbP5NoFLJni+4hbLQkyMzguBvLzA2fv85Xu0u6KUOryJ+
-NdnQt1alFsRpl1az75YcTXv5ac5GvKIhPVFC9vM8bhRSn/M39cmTbCGjc5DrcJKN
-9rgo6/NMsJU5FEML1Jty8vOSZsHFv2rDykJHArANAmjEkV2rsJHE3N+3SKuzrUiI
-hQgmZkWQiscIRv5K
+MIIDYDCCAkigAwIBAgIUQvVmd8amI67R7MF0G2PGpJR/w74wDQYJKoZIhvcNAQEL
+BQAwSDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEWMBQGA1UEAxMNU3RyaW16aVJvb3RDQTAeFw0yMDEyMjQyMjUxMDBaFw0y
+NTEyMjMyMjUxMDBaMEgxCzAJBgNVBAYTAkNaMQ8wDQYDVQQHEwZQcmFndWUxEDAO
+BgNVBAoTB1N0cmltemkxFjAUBgNVBAMTDVN0cmltemlSb290Q0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDn4RhhH6xediUowLNXJTTTh1Oa1U4uUONQ
+eMxZBADNH6FCDi2j4OLBz9NbT2hpSumFV5rwR1SA0rRtA/nK/dOrArdMg2DE414r
+xoMZz1eYcPjbtfhPfecj7Q5rswyM4u84dw+g+DLq33Ko9iXTdp0XfUye65cq6JH4
+h0KNJ6pimSQpZcEEGkfL8/dOriZ7yYBpt9pPvz/6R79YIkFGzvWoo36YmJRm3BXr
+DariBM4RQoyAhhD3LMP1AZbHHnaqn6+aK+GSnK6qfNL53RUZ6oFr+XuY09Jdm92h
+Y1pLLeXUfNcaoK3gw/tDf6YaH5GETi47DkSXoY5QNMqeqlB6e9ILAgMBAAGjQjBA
+MA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQenHAD
+0AYollZFtYcPPqSZIWyKAjANBgkqhkiG9w0BAQsFAAOCAQEAx7cuX8D5lIbdAQKL
+q4NWrFiQoiosjW8NyNg0QI7iWmqcu+VosyE5etxIF/uXOpmICvAa15SnR8+VsEpI
+8GuYvWgx9mVo6R0UZ9DKrJGe39k7Ekgrget4CuIHhfHgfCrpP5fvIJsxW/RneWmi
+4yVHVMRUcZXfH6/kUNVY+rRblmN6CXqn7wUWp4tgjKEgOuS6R/OlxqFygEo9Jeyr
+n6otd7MzXyl2JudD63sv9I+WkGLaCSb+5dVd/i8BjEjTAGkGUBw0YU1UMdqHuiUk
+lQvFZ8YLBZbWjXpZlhVg7hjenHL1v1ThhoUMgaGCoEYS4bOnagWq3RJhrcqzAmir
+pVB/mQ==
 -----END CERTIFICATE-----
diff --git a/systemtest/src/test/resources/custom-certs/ver2/strimzi/strimzi.key b/systemtest/src/test/resources/custom-certs/ver2/strimzi/strimzi.key
index 4a1f9102d99..10af7072cf9 100644
--- a/systemtest/src/test/resources/custom-certs/ver2/strimzi/strimzi.key
+++ b/systemtest/src/test/resources/custom-certs/ver2/strimzi/strimzi.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDSM8VfNB7nU7y1
-i+eBVjvrfQIOMj+ogA0TQfh31NzptVTvyYemhmzbEAhsRj3bYVVtjYrbicG55VDb
-3luINAAKcOu93yejL4r033olX81NZI5DcUeW0RNL01F6Gx9PTgUm/Jr4SQ63wFsw
-vLaaMA6UvgquCsGP/BWdtnBUz3wMN3PoXvVmQbk5aEOPX4mPSeypQ0C9GQsD8eUx
-78owkqOc6BA8gsrmzC4VXxBL1ZczCeHYk5ZLRWSi4ZOhzGxzK+RXtZsZ5LvbhwJ0
-v8l5wOm9Xo4jPqgsntz07QXGzTx0oObp4qLpYVMcx6QvKnNr07pd+919y/i5TtF6
-M/GVCyUjAgMBAAECggEBAJJecGppvbcxDO+R2wOpy5Gf+4VtIfywJeqp/l1bAPVQ
-SjOqrmWbp0MnN+ZFRx9y+GyPqghTNW2/q31eqXf/VaPvm4gcUtqD6Yu37bMGscvZ
-YGLAB6ySK5CaNlsDddrgJiBOt456OOBk9lrKnZBiNFUIvCES5lPfoiGu/ytfSy6p
-T0noMENSrTvskLkwIaYyd9STD97t8d0arwktBFFpUISDfa84CUg4quSsWrhZ0tT6
-gCE649Y2GKgSQTJwvsIwtLClu3+8y1exlyDiUI7UUcXjFKTHxqj26nISpAwJAgLM
-XYuq+2szc/4/94ET1W0RCnPmIy/ZgnkqwhfehXiRWRkCgYEA4n3+MxR30Cgu0CLD
-0LXxy1/CNCW9kRHNYEZs8G43yCAGhYNbTJCnTwl3ZATcTIZzkVfKqybrw29mJfjx
-M9m72CQuppoR2HGJ3zHBCyPxKmQJicupQeSfke7Ac8nGdeIlgUfcw5FAK4rEPxmx
-CCXUNoLxH8fS4id6hgNj8f7C1V8CgYEA7ZZ5LtB8GyAJBLkl88tQTHcIhBtISWBm
-GJ6LnDlCw5SCV/qxvhKjByBIoopX9eDskD4I2LxkF7M4xxSUjeD7SCUV2dP5Q5h/
-3L03ptdBt4n/UGwLp+CUIjrwUMQQobek9SKcn0klilCCOJN3iAYbNRb6hdlmb9J/
-N1ancZlDIr0CgYApFZG20k+pgqB7QNMkWNyzd3tS2kW4uvH2NNAuDNAxjR2humIl
-UVgIDj+J9RfBCeKMytAIm9bIbLyqxq16KlTYsDeGIQx7ppzLz8qkqrBkcCEKzda2
-DTKk1hoy5rcJSyxidxakowRw4YsXpyFlyPblrHrwuN6YB3FCPfszOnM9IQKBgDCm
-m3IGpyM20CHzd94QSAUgatICdC7yWnW4IYaAAzfhdT9mynbNgiy3Y6hFA/YJdOek
-jFM1YJmpzXqWsETNSSdg0LSmP2ikFaqx5G95rK9Uxr9FIK3jwvGvd/5R58X1wQWh
-bMkBRXqpOcE0EUn9Vhzs86fs+Jj1Va+TQv50D9dRAoGAUJ9q5wgulUHtCtbXYT5T
-M5gfhxW1MLgBvZVE8XIb6j9KU+Cr7K2f0VDzWEqNIIgjEIG0xX6Lc1kvk3PJ4ygq
-vV1Wj+1/ziwYZWqoH3hKUfoCO7Zxf87cirOuwBD17kTvjTSXFPogrgOl0kHzZtvc
-9WvpLw/PM/ur5IcZI96+gqQ=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD8A4ahlmtMtuPt
++A1nO9NYwgPIrbt8pkrCBKkoTD6Ziw2R8zi1W0tV3knJIWb+b9dqaAhbOu1WIec6
+Sd6MekwsO5MbA0TnpkqYbpQWTQhZ10T3qGtU8c1kVG/iEHyojJG9Nnuz/rdTafwT
+EWfZRLV09Ft1Q5urr5aqTC/qnmqWiBSkX1Bk/wZOvDEcikwYOvvyss7/6tJ5KNGm
+i4Ar+1MVolgO0Ilv/2UETsX28VfqaVZ+e0S2Gi95SBOM+QMApRGu9uO8xBDZoDNV
+HtWm7QRgdPinwdv5U3iOHl7WHxTrq4V+/fBAEgbd90KMywtAxGH+xH0yS9c+PGNx
+4wI2CczpAgMBAAECggEADD5fnBoivGdmS3lxrUJK0lUaufU21qd9mk9/qGWL5QnM
+bvrSFn2I+3MBQrRMvK/SV2kWftguD7E1+q78EPcgHEYIr5dJEbgSh7VXnH3BmhvL
+Tfzwuf/FaspvZRxH8ihiLD8pY2VMotDTXlnKIdQkvLnid6ABQCYXu85XxZ5Mr2N0
+bwBOX7NEJoHdEppKxCzD1oBTKbJYV1loPncZYvx6actJGEjyuwRYkjyHUcTEezNC
+KlE+hYmxPr+rVtI0XlVFVbXWI+Bgpw03eOTcT5oztsNVcQ+XCoSDF243/tktoNjJ
+Rl7FHgZN7GU6GStC4XhrJBIUb1LEtP2q4sH1DwxoAQKBgQD/CsygDq5rXTSf0tCs
+gjGc7Y/j8my35MVsCVl731R7C+33yKJlPcrp1V8rxnzNYdcmC9FpFOvYpzFHq40E
+Fk0Fy/FfYo2yKv8S9RGWuXrPym+21aOjEuj4R8toCelpo8fgCOPqWaYZJYZilB6J
+wEKh1WKhqOcHmdw695ysoXKwEQKBgQD89dCmC5HnV/XpsVV+QxlzVyIkIutJZe+m
+ltDnL+DxQyLG5tHrRjgNTq/Mfz4CLJyxSTk6R8G7xSa1fUcTdIDq19T3WbA3feqS
+YFi6EPFLqglr63EwXmloKKF7iTiGdGYMcZh0ynz6XiMqtqKIMmmUtIpW696yt3su
+4CgeLtgnWQKBgQCC0bdEIkO1LonfsPL4iY+JPxGfiqnZaa8aS3Fq6JMcynG1t2QV
+Kiz65Ed83MMHVjhVe5penCydZKUSbhxXDFlVr9aPZq3nxcYwoyPyfBFSpDPJRKw6
+6Wg2ch0TsIHZffj4IZdGjdV08JqN1gwT/FoxSJLe+RQIAhPE612h7u41AQKBgEyx
+wsb1LxFzK83kxET51xePTXyjUa75RwW9KC1P6OV9M2gWx4KL0abHOqnH0mcaW4+s
+4br30pc5mRjhmNEfO474TUuJV9IbTSmAKKaRSHdmYGDmC3VcypyX5Q3tdsPdOqt/
+LXgLhITsUcE7il+82SIK8v6TmPuagbCeqcss7MBRAoGBAI91DEzFcGQYriSkePkd
+MzS0Piys4Szn0rQZ5W884TlsM771RFHT7tA/yoOXpMcDeYE0d9bfizTZh/t9iphA
+tWCUIGDbjc3m4j2xZ0lzEyR+Rfv00BkpKO4Crhf6qCs4EWNRZOYS+pWYcKtwUGMi
+TjUeWjeI+9aKAKnVwPEEygYt
 -----END PRIVATE KEY-----
diff --git a/systemtest/src/test/resources/custom-certs/ver2/strimzi/strimzi.pem b/systemtest/src/test/resources/custom-certs/ver2/strimzi/strimzi.pem
index 237ff464e40..73fbdc041ea 100644
--- a/systemtest/src/test/resources/custom-certs/ver2/strimzi/strimzi.pem
+++ b/systemtest/src/test/resources/custom-certs/ver2/strimzi/strimzi.pem
@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-MIID2DCCAsCgAwIBAgIUfxqU7q8SaHIi2sGVi2OmQfv0gNMwDQYJKoZIhvcNAQEL
-BQAwVDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEbMBkGA1UEChMSSmFr
-dWIgU2Nob2x6LCBJbmMuMRcwFQYDVQQDEw5JbnRlcm1lZGlhdGVDQTAeFw0yMDAx
-MjExMDU4MDBaFw0yMDEyMTkxODU4MDBaMFYxCzAJBgNVBAYTAkNaMQ8wDQYDVQQH
-EwZQcmFndWUxGzAZBgNVBAoTEkpha3ViIFNjaG9seiwgSW5jLjEZMBcGA1UEAxMQ
-a2Fma2Euc3RyaW16aS5pbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANIzxV80HudTvLWL54FWO+t9Ag4yP6iADRNB+HfU3Om1VO/Jh6aGbNsQCGxGPdth
-VW2NituJwbnlUNveW4g0AApw673fJ6MvivTfeiVfzU1kjkNxR5bRE0vTUXobH09O
-BSb8mvhJDrfAWzC8tpowDpS+Cq4KwY/8FZ22cFTPfAw3c+he9WZBuTloQ49fiY9J
-7KlDQL0ZCwPx5THvyjCSo5zoEDyCyubMLhVfEEvVlzMJ4diTlktFZKLhk6HMbHMr
-5Fe1mxnku9uHAnS/yXnA6b1ejiM+qCye3PTtBcbNPHSg5unioulhUxzHpC8qc2vT
-ul373X3L+LlO0Xoz8ZULJSMCAwEAAaOBnzCBnDAOBgNVHQ8BAf8EBAMCBaAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0O
-BBYEFLLT3C1aelVP4NP/l+GOobQWAL0zMB8GA1UdIwQYMBaAFGSGPZR4Hcd5B+rl
-ZhFX/KyH+HBiMB0GA1UdEQQWMBSCEiouMTI3LjAuMC4xLm5pcC5pbzANBgkqhkiG
-9w0BAQsFAAOCAQEAxFAoA1+Xhh8SHBCMsyA/tqS6zl0BVKocRbwYws81EAE45Ass
-fNmvzla9270awCkaj87hEvyFV/brbztAVBz7aQC5n3BLH6JGLnWS4rvxaz5diAW6
-4+CHKrp3DxLsMqWgsJC7K9m0i9dKkG3QYoTbVXbVrvfS9iuaT9ZgyQS0hdA5zDqn
-MfRJ/Nrpnt0d4w7edEySrMu37DXdOnUh20yTVVo+DfuViyunecRrGmzpu7bTnXbn
-fsMj50KWyBBiH4ypt5W0iLtq0lOYjGi+8H7D2iYEBRoSEwbQlNmkyuX5wopIn3F8
-JE8YKhaZ28m1XYbJlpsRItlFgn+V4oNTVxj8Lg==
+MIIDyTCCArGgAwIBAgIUOP7s/EuEBZqD0tZk51bv95BEK3IwDQYJKoZIhvcNAQEL
+BQAwUDELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlByYWd1ZTEQMA4GA1UEChMHU3Ry
+aW16aTEeMBwGA1UEAxMVU3RyaW16aUludGVybWVkaWF0ZUNBMB4XDTIwMTIyNDIy
+NTEwMFoXDTMwMTIyMjIyNTEwMFowSzELMAkGA1UEBhMCQ1oxDzANBgNVBAcTBlBy
+YWd1ZTEQMA4GA1UEChMHU3RyaW16aTEZMBcGA1UEAxMQa2Fma2Euc3RyaW16aS5p
+bzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPwDhqGWa0y24+34DWc7
+01jCA8itu3ymSsIEqShMPpmLDZHzOLVbS1XeSckhZv5v12poCFs67VYh5zpJ3ox6
+TCw7kxsDROemSphulBZNCFnXRPeoa1TxzWRUb+IQfKiMkb02e7P+t1Np/BMRZ9lE
+tXT0W3VDm6uvlqpML+qeapaIFKRfUGT/Bk68MRyKTBg6+/Kyzv/q0nko0aaLgCv7
+UxWiWA7QiW//ZQROxfbxV+ppVn57RLYaL3lIE4z5AwClEa7247zEENmgM1Ue1abt
+BGB0+KfB2/lTeI4eXtYfFOurhX798EASBt33QozLC0DEYf7EfTJL1z48Y3HjAjYJ
+zOkCAwEAAaOBnzCBnDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFC1QMO4abbE/GsZ0
+/4YdjcYiHyelMB8GA1UdIwQYMBaAFHVij5x3WgNOoBuHUmfPhe1hbdGOMB0GA1Ud
+EQQWMBSCEiouMTI3LjAuMC4xLm5pcC5pbzANBgkqhkiG9w0BAQsFAAOCAQEARWei
+Cxo3kOSkZpSz1Kj6+cpc/ktyRna7dngurtjJrBl0ZuoylW2pH4CH/+jDmQ1zO8rK
+ZvocpKhlCl3jEfujo8cZq+FREObS65MEgRxn3Bw07RpFjmjgh3o+a5BLgZLDut5o
+h5EvUm/vRoP4DQ1e2ZA3cBa3I9RU7mbTMFl5qnBzJwXCtaGo1V0C+yGaCRTHnrCZ
+7o/Wn6ibRmIzi+btSediYG2oz0qGSlohvU++trDkcTcfcFaVV1qryauHz2lvXy8T
+Jc02eeCx2IpVUaRVfjZV5vY47YmDqjUXIcU3/4KTnRXMgA4D4TiVch/TXAsQixt4
+tYtOQhD13tOf+Vyp0g==
 -----END CERTIFICATE-----