#41484 by nickl, flk, and budda. Don't wrap the category selection in a fieldset if there is only one vocabulary.
(Needs to be backported, I think)
