Use that list of valid vhosts we just carefully created.
Merge bug25592
stable to default