fixes for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=530952Change-Id: I0000000000000000000000000000000000000000
Additional fixes for bughttps://bugs.eclipse.org/bugs/show_bug.cgi?id=532205Change-Id: I0000000000000000000000000000000000000000