AI-636: Workaround for form submission authentication problem
Merge branch 'release' into version4

Conflicts:
	server/src/main/java/org/activityinfo/server/endpoint/odk/FormSubmissionResource.java