Merge pull request #3114 from mpg/ssl-opt-names-2.16

[Backport 2.16] Improve some test names in ssl-opt.sh