Fixing compilation after platform update. Some refactoring#612

VISTALL merged 1 commit intoconsulo:masterconsulo/consulo-csharp:masterfrom

unv-unv:compilation-fixunv-unv/consulo-csharp:compilation-fixCopy head branch name to clipboard