Merge branch 'R3_7_maintenance' of ssh://skandula@git.eclipse.org/gitroot/jdt/eclipse.jdt.core.git into R3_7_maintenance