[#75002932] Turn control-groups to form-group for new form html markups