Merge branch 'post-release' into STS-3818-project-deps-in-container

Conflicts:
	org.springsource.ide.eclipse.gradle.core/src/org/springsource/ide/eclipse/gradle/core/GradleProject.java