IDEUI-282 and IDEUI-283

https://jira.codenvycorp.com/browse/IDEUI-282
https://jira.codenvycorp.com/browse/IDEUI-283