Merge pull request #9546 from gilles-peskine-arm/ssl-opt-psk-detection-3.6

[3.6] ssl-opt: improve PSK mode detection