Wildcard name-based vhosts printed twice in apachectl -S

PR54948

Proposed by: covener
Reviewed by: jim, rjung

Backport of r1485675 and r1525000 from trunk.


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