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