Removed service path on public services when dns delegation is enabled (EUCA-9189).  Retained trailing slash after port
Merge branch 'dev/ethomas/EUCA-9189-5' into testing