o.c.opibuilder: update versions after EDM mode changes
Merge branch 'edm_clean'