Merge to current 2.4.x, r1781041.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@1781045 13f79535-47bb-0310-9956-ffa450edef68