IDEX-589:
Merge branch 'IDEX-589' of github.com:codenvy/platform-api into IDEX-589