Support vhosts as part of username
Merge bug25877