Merging changes from work done for https://bugs.eclipse.org/bugs/show_bug.cgi?id=331974
46 files changed