Upgrade menu_block to 2.4 and remove patches on field_group.