Use new Forge addon repository API and fix default bundled addons. Still a bug with addons being deployed in two separate repositories, but working if no duplicates exist.