Merge pull request #1948 from akoeplinger/fix-httplistener-test-race