Merge "Fix reconciling dns addons on version changing"