IDEX-1564
Merge branch 'master' into CLDIDE-2106
Merge branch 'CLDIDE-2106' of github.com:codenvy/platform-api into CLDIDE-2106