[DF-185] Fix convertation to etc
Merge branch 'development-qa' of https://github.com/dava/dava.framework into development-qa