Show "remove" button when MaxFieldsets = 1 and Multiple Fieldset Types

... so the user can switch types (remove/add) when only a single row.

We check for Multiple Fieldset Types as well, because we don't want to show a "remove" button when there's only one type allowed (presumably).
Use a count on the add button rather than checking flag
Merge remote-tracking branch 'upstream/master'