Merge branch 'master' into johntestaug25 Conflicts: tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FileSystemHelper.java