Fix flay testserverbuilder test.
Merge pull request #3395 from jakewins/2.1-testserverbuilder-flakyness

Fix flay testserverbuilder test.