Merge branch 'master' into johntestaug25

Conflicts:
	tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FileSystemHelper.java

tests/org.eclipse.e4.core.tests/test.xml

diff --git a/tests/org.eclipse.e4.core.tests/test.xml b/tests/org.eclipse.e4.core.tests/test.xml
old mode 100755
new mode 100644