Adding support to use endpoint name as public return address

We need this for the scaleout support