Refactor global portallocator and portmapper state Upstream-commit: ce372cd6642ff0dd2de9eece489a847f088eb3bd Component: engine