Fixed for https://bugs.eclipse.org/bugs/show_bug.cgi?id=576081

Change-Id: Iecdfa0b3869b4eb403babf99cea78deb24f3024c
6 files changed