fix merge issues and some test cleanup
authorGeoff Kizer <geoffrek>
Wed, 6 Feb 2019 19:10:02 +0000 (11:10 -0800)
committerGeoff Kizer <geoffrek>
Wed, 6 Feb 2019 22:02:20 +0000 (14:02 -0800)
commit34ca14c0596bd69c264c81e4551bc55b3396567d
tree0e0857ff75c18f4eee40175df0838979604b27a8
parent43e41e93288f0ad08476313f9bbc7944f7f9b840
fix merge issues and some test cleanup

Commit migrated from https://github.com/dotnet/corefx/commit/340d2ac71afcbb6f9ea220e7549fcf8247995678
src/libraries/Common/tests/System/Net/Http/Http2LoopbackServer.cs
src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http2.cs
src/libraries/System.Net.Http/tests/FunctionalTests/PlatformHandlerTest.cs