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

Fix flay testserverbuilder test.
Merge branch '2.1-maint' into 2.2-merge-2.1
Merge pull request #3407 from chrisvest/2.2-merge-2.1

2.2 merge 2.1