BZ-1169627: fixed errors updating field type & HTML labels
Merge branch '6.2.x' of https://github.com/droolsjbpm/jbpm-form-modeler into 6.2.x