fixed ECLIPSE-1024 and ECLIPSE-1025
Merge branch 'master' of github.com:fusesource/fuseide