INT-3518: Upgrade versions and some cleanup

JIRA: https://jira.spring.io/browse/INT-3518

Tested with `gradlew clean testAll --refresh-dependencies`