Merge r978903 from trunk:

Merge mod_dir fixups to avoid possible ordering issues noted by trawick

Submitted by: niq
Reviewed/backported by: jim


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