DF-3917 fixes after review
Merge branch 'development' of github.com:dava/dava.framework into development
Merge branch 'development' of github.com:dava/dava.framework into development