cherry-pick UDPv6-only fix. from @justincormack
Source for buildrump.sh git rev 9101947520709cb7cb9f441c5f657b5623559a7f