IDEX-811; IDEX-706: Update in according to Codenvy API changes