Merge branch 'integration' of ssh://git.eclipse.org/gitroot/jdt/eclipse.jdt.core into integration