Merge pull request #8699 from shuai-z/fix-portalloc

Fix corner cases in ipallocator and portallocator