HELIX-30: ZkHelixManager.carryOverPreviousCurrentState() should use a special merge logic