Fix config ids; drop editorial/ or commercial/ for config updates
Merge branch 'fix-config-ids'