Merge pull request #5298 from paul-elliott-arm/ssl_context_info_prog_2.x

Backport 2.x: Two fixes for SSL context info sample program