Merge branch 'Without_Enable_Disable_Mechanism'

Conflicts:
	source/public-request-form/src/main/resources/messages.properties
	source/public-request-form/target/classes/messages.properties
	source/public-request-form/target/maven-archiver/pom.properties
	source/public-request-form/target/public-request-from-portlet-6.0.5.0.war
	source/public-request-form/target/public-request-from-portlet-6.0.5.0/WEB-INF/classes/messages.properties