fix persistent port allocation Upstream-commit: fef1e0a7089820b06fdc2de3d536fe0e5e41f0cb Component: engine