LPS-43510 localhost virtualhost

Hi Julio,

Seems doesn't break anything. I've tested even using load balancer...

After LPS-42068 we changed the behaviour we were following in 6.1.20, and this pull pretends to fix that case without causing regression.

@sergiogonzalez Maybe you want to see the second commit, for avoiding LPS-42068 again.

Thanks!