5.2 merge

I believe all pom.xml changes were taken into account. s2s project changes were imported. Integration tests pass other than necessary sql changes and application runs.

There are both KEW and db changes that must be run once this is merged.