meta-oic: Align to 1.2.0, drop downstream changes