[DF-185] fixed code after wrong merge
Merge branch 'development' of https://github.com/dava/dava.framework into development
Merge branch 'development' of https://github.com/dava/dava.framework into development
Merge branch 'development' of https://github.com/dava/dava.framework into development
Merge branch 'development' of https://github.com/dava/dava.framework into development
Merge branch 'development' of https://github.com/dava/dava.framework into development
Merge branch 'development' of https://github.com/dava/dava.framework into development
[DF-185] Small fixes
Merge branch 'development' of https://github.com/dava/dava.framework into development