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

Change-Id: Ia96fb480d6683ed76fb3ddc70a71ae3a80a961a2
5 files changed