Merge branch 'master' of ssh://git.eclipse.org:29418/tigerstripe/org.eclipse.tigerstripe into split_generation

Change-Id: I3a2ac23adf6408af0175b17f204977d3f3d20a8d