Merge branch 'master' of
ssh://bpayton@git.eclipse.org/gitroot/datatools/org.eclipse.datatools.build.git

Conflicts:
	features/org.eclipse.datatools.sqldevtools.results.feature/feature.xml