TRUNK-2999 Addressed more review comments

(cherry picked from commit f10bebefef9ada684f6b11d0de6fa0d377400c34)

Conflicts:
	web/src/test/java/org/openmrs/web/controller/form/FormFormControllerTest.java