Back-port r1424947, r1424971 from trunk.

Add new SSL_OP_* constants to OpenSSL option-detection.



git-svn-id: https://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x@1425135 13f79535-47bb-0310-9956-ffa450edef68
Remove svn:mergeinfo property from the file
(was: /tomcat/native/trunk/NOTICE.txt:r815411 )

git-svn-id: https://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x@1430759 13f79535-47bb-0310-9956-ffa450edef68
s/2012/2013/g
It is a merge of r1430753 from tomcat/native/trunk

git-svn-id: https://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x@1430763 13f79535-47bb-0310-9956-ffa450edef68
Add my new signing key. Old one has exipred

git-svn-id: https://svn.apache.org/repos/asf/tomcat/native/branches/1.1.x@1432834 13f79535-47bb-0310-9956-ffa450edef68