IDEX-637 fix test
Merge remote-tracking branch 'origin/master'

Conflicts:
	codenvy-ide-core/src/test/java/com/codenvy/ide/importproject/ImportProjectPresenterTest.java