Remerge r1584555 but without the changes on (un-backportable) SSLOCSPUseRequestNonce.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1584653 13f79535-47bb-0310-9956-ffa450edef68