JDT Service and Service Manager fixes
Merge branch 'master' of https://github.com/eclipse/flux.git