OC- 6048
some clean up
Merge remote-tracking branch 'origin/OC-6048' into OC-6048

Conflicts:
	web/src/main/java/org/akaza/openclinica/web/pform/OpenRosaXmlGenerator.java