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

Change-Id: Ib37ad7c66ede7d29a7004da0bb3ab81a047931e8
3 files changed