https://bugs.eclipse.org/bugs/show_bug.cgi?id=355675 - made the suggested changes
8 files changed