Fix problem with ipv6 link-local address(es)

Pick up the snippet from glance per markmclain's comment on another review

Change-Id: I6105990fb843a6aadca29b243428bf28510957c7
Merge "Fix problem with ipv6 link-local address(es)"