Merge branch 'master' of ssh://git.eclipse.org/gitroot/tigerstripe/org.eclipse.tigerstripe into removeOssJFromSrc