[DF-1004] Fix compilation errors after FilePath changes
Merge branch 'development' of https://github.com/dava/dava.framework into development