Merge pull request #5112 from paul-elliott-arm/ssl_opt_fixes_2.16

Backport 2.16: Ssl opt fixes