Fix issue with IPV6 DNS resolution.
EUCA-2329
Merge branch 'dev/chuck/EUCA-2329' into testing