""
Merge remote-tracking branch 'origin/master'

Conflicts:
	sveditor/plugins/net.sf.sveditor.core.tests/src/net/sf/sveditor/core/tests/SVCoreTestCaseBase.java
A few diagnostic test updates