Merge branch 'release/2.4' of git://git.eclipse.org/gitroot/rcptt/org.eclipse.rcptt