Correct merge error in r1673860 and r1673871:

move CHANGES entries to correct version.

Use "mod_ssl" instead of "ssl".


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