Put changes from pr #357 in the right branch

It was merged in `release/scala-ide-3.0.x-juno`, this pull request apply the changes to `master`.

We may want to ported to `release/scala-ide-3.0.x` and `platform/juno` too.