Automatic merge from submit-queue (batch tested with PRs 38942, 38958)

Refactor port allocation logic a little, deflake tests.

This should fix #38323 for real.

@xiangpengzhao @rmmh @justinsb 

Switch to manually cranking over the port filling logic, since there was a race between the allocate logic and the check to see if the port was freed up.