Changes according to release review comments
see https://bugs.eclipse.org/bugs/show_bug.cgi?id=505736
7 files changed