Merge branch 'e42' of ssh://git.eclipse.org/gitroot/ajdt/org.eclipse.ajdt into e42