See https://github.com/spring-projects/sts4/pull/464 I've reverted the merge for the time being. Will need to take a closer look and determine why tests are failing before merging again.
