Refactor deploy of addons via EMCO

No match.