Fix issues with formatting

Fixing discrepancies between master and development that create merge conflicts when merging back.
UAR-875 Merge branch 'UAR-807' into release
UAR-875 Merge branch 'UAR-839' into release
UAR-875 Merge branch 'UAR-840' into release
UAR-875 Merge branch 'UAR-849' into release
UAR-875 Merge branch 'UAR-864' into release

Conflicts:
	src/main/resources/edu/arizona/kra/datadictionary/CustomProtocolContingency.xml - Resolved by keeping changes in both files.
UAR-875 Merging release back into master for release 5.2.1-release8 with fixes for UAR-807, UAR-839, UAR-840, UAR-849, UAR-864, UAR-873
Merge branch 'master' into development for release8

Conflicts:
	src/main/resources/edu/arizona/kra/datadictionary/CustomProtocolContingency.xml
	src/main/resources/edu/arizona/kra/datadictionary/CustomProtocolOnlineReview.xml