Fixes for https://bugs.eclipse.org/bugs/show_bug.cgi?id=565197

Change-Id: Iff2d700c0649a934f8e2d5e11589ab445db95988
10 files changed