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

Change-Id: Ia172b69bfa79867d818ead621ae6c8254b755621