Merge pull request #24108 from nmav/tmp-openconnect-fixes