IDEX-811; IDEX-706: update in according to the latest Codenvy API changes
Merge branch 'master' into new_tree
Merge branch 'new_tree'