Fix some failing tests
Merge branch 'master' of github.com:spring-projects/eclipse-integration-gradle