7.x 4.x form wrapper restoration

This fixes issues we were having with form elements containing only the "control-group" class, for Bootstrap. We now have appended "control-group" to all other classes rather than replacing them with it.