Add patch to field group to avoid exportability issues

There is an issue with field group that makes it add field groups that belong to other features when you add complex dependencies. There is a patch for it that we need to apply.