Remove a race hazard from the execrable Support_TestWebServer
am: e2137568da

Change-Id: Id0b633ae91de88df250257c68acfac5c9d29e41f