Fix bug in MergeAddons
Fix bug in MergeAddons

* Replace existing addon if v (new) replaces() existing, instead
  of the other way around.

kubernetes/kops,justinsb/kops,justinsb/kops,kubernetes/kops,kubernetes/kops,justinsb/kops