Fix to fieldset bookeeping to avoid creation of duplicate fieldsets

See also: https://community.plone.org/t/add-field-to-existing-fieldset-in-inherited-behavior/277

TODO: A test. I'll manage to write it today or not at all :)