Update spring-integration import test to recent version.
Merge branch 'master' into sts-tooling-model