Reduced the bumpiness (from major to minor) and utilized #defines throughout

(per Ruediger's suggestions). Still looking at the dir merge.



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