Patch Set 1:

The test failures are caused by another fix that already got pushed to master (even though there were test failures reported by Hudson). See https://bugs.eclipse.org/363833 for details.