Merge remote-tracking branch 'vicamo/bugzilla/957917/firefoxos-ipv6' into HEAD