Merge pull request #3831 from rolfbjarne/watchos-fix-defaultproxy-test