Fix topology lookup of local services, allows DNS resolution - EUCA-8746

EUCA-8746
Merge remote-tracking branch 'origin/dev/sjones/EUCA-8746' into testing-merge-temp