Issue #2392301 by yched, joelpittet: OptGroups::flattenOptions() should preserve labels