Merge remote-tracking branch 'sdibona/OC-5839' into OC-merging

Conflicts:
	core/src/main/java/org/akaza/openclinica/service/PformSubmissionService.java
	core/src/main/resources/properties/openRosaXFormMapping.xml
	web/src/main/java/org/akaza/openclinica/web/pform/OpenRosaXmlGenerator.java
	web/src/main/java/org/akaza/openclinica/web/pform/widget/Select1Widget.java
	web/src/main/java/org/akaza/openclinica/web/pform/widget/SelectWidget.java
	web/src/main/java/org/akaza/openclinica/web/pform/widget/WidgetFactory.java