[DF-4580] Fixing review issues
[DF-4580] Fixed build
Merge branch 'vegetation_mask_editor' of https://github.com/dava/dava.framework into vegetation_mask_editor