[Bug 1010593] Add back field to merge groups in the admin

fieldsets option added to admin configuration, but the merge_with field wasn't added.  Adding it in order to have the feature back.