Update legacy DNS resolution for separated services - EUCA-8968

EUCA-8968
Merge remote-tracking branch 'origin/dev/sjones/EUCA-8968' into testing