Map IPs to appropriate interface when describing services - EUCA-9250

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