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-766 - Forcing OJB refresh of Protocol.protocolActions property to avoid NPE.
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
UAR-766 - Adding foundation file.
UAR-766 - Pushed OJB refresh of Protocol.protocolActions into parent base class.
UAR-794 Merge feature branch 'UAR-625' into release
UAR-794 Merge feature branch 'UAR-649' into release
UAR-794 fixed merge conflicts for CustomCoreSpringBeans.xml and kc-config-defaults.xml merging UAR-676 into release
UAR-794 Merge feature branch 'UAR-708' into release
UAR-794 fixing merge conlifct with CustomIrbSpringBeans.xml merging UAR-720 into release
UAR-794 Merge feature branch 'UAR-742' into release
UAR-794 fixing merge conflict for ActionHelperBase.java for UAR-766, ensuring changes from UAR-680 were preserved
UAR-794 Merge feature branch 'UAR-773' into release
UAR-794 merging staging to master for release 5.2.1-rel4 with fixes for UAR-625, UAR-649, UAR-672, UAR-673, UAR-676, UAR-708, UAR-720, UAR-742, UAR-766, UAR-773
UAR-677 (Corrected Branch) Initial Commit

Initial Commit of CustomDataHelperBase.java

Note we had to redo this branch because it was created from the development branch and not master.