IDEX-1284
Merge branch 'master' of https://github.com/codenvy/plugin-java