Race condition fix for swarm join/leave Upstream-commit: 77d5a0996f0e007330424ea4740e908fd887cf37 Component: engine