Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=490819

Change-Id: I18eac7178000b43c47de63a4de37198f9c06f901
8 files changed