Fix some test failures.
Merge branch 'master' of github.com:SpringSource/eclipse-integration-gradle