UAR-606, fixed merged conflicts for files: struts-config.xml, CustomIrbSpringBeans.xml, kc-config-defaults.xml, and pom.xml
Merge branch 'UAR-620' into release
Merge branch 'UAR-680' into release
UAR-693 Fixed merge conflicts for src/main/resources/META-INF/kc-config-defaults.xml
Fixing syntax error at #39.

There was an additional <<<<<< HEAD remaining in file from the manual merges.
UAR-769 merging release to master for release 5.2.1-ua-release3 with fixes for UAR-696, UAR-606, UAR-620, UAR-680, and UAR-693
UAR-769 removing incorrect reference for ProtocolForm from older merge