Fixing issues with OpenSSL on some setups
Merge pull request #12423 from FredericJacobs/master

Fixing issues with OpenSSL on some setups