TRUNK-4325 Randomly failing tests in ShortPatientFormControllerTest

(cherry picked from commit 13c0dab4d28f17a92935ea7a9571945dc49bf227)

Conflicts:
	web/src/main/java/org/openmrs/web/controller/patient/ShortPatientFormController.java
Fixed formatting