Merge branch 'upgrade-spring-dependencies' into 'master'

upgrade spring dependencies (GONRG-5416)

See merge request !55
22 jobs for master in 9 minutes and 7 seconds (queued for 4 seconds)