Merge pull request #5074 from paul-elliott-arm/fix-resumption-openssl-client-tests-2.16

Backport 2.16: Use newer OpenSSL for tests failing with the old