Merge pull request #9917 from valeriosetti/issue9685

[development] Remove the DHE-RSA key exchange