Merge pull request #9556 from gilles-peskine-arm/ssl-opt-psk-detection-development

ssl-opt: improve PSK mode detection