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

Change-Id: Ifb21de213039dbb9ff7627c8d945216636ae6b9e
23 files changed