Merge "Enable kube-addon-manager leader election"