[DF-4622] Fixed includes and added const to GetGeometricData
Merge branch 'wotg_merge' of https://github.com/dava/dava.framework into wotg_merge