INT-3311,INT-3377: Update Spring-* dependencies

JIRA: https://jira.spring.io/browse/INT-3377
https://jira.spring.io/browse/INT-3311