Add square brackets for ipv6 based hosts

Closes-Bug: #1364837
Change-Id: I8f9702377cc049b74622c2db847ffac3ba946b3a
Merge "Add square brackets for ipv6 based hosts"