Merge r1726888 from trunk:

Fix some duplicate definitions
Submitted by: mrumph
Reviewed/backported by: jim


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