Merge "Move VIP-related data to AllNodesConfig"