Refactoring portallocator away from a global var Upstream-commit: d852e5fde89ecd5eec53983be3c62e371147ad8c Component: engine