Issue #2238991 by balatin, mpotter: Patching for field_group module.