Don't expose a port for every server
Use port-based method if VHOST is not defined
Merge psm14/features/less_esposed_ports