When merging the main server's <Directory> and <Location> sections into

a vhost, put the main server's first and the vhost's second.  Otherwise
the vhost can't override the main server.

Reviewed by:	Roy Fielding, Ralf S. Engelschall, Dean Gaudet
PR:		717


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