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

plus feature version updates

Change-Id: Ie89a7c0012cfabcdb7733c8983cb644f0b6e224a
7 files changed