Merge branch 'bugfix/fix-compiler-warnings' into 'master'

Fix a few compiler warnings

See merge request !231 (merged)

(cherry picked from commit e9f22289)

9f57c267 [mcmgmapper] Fix deprecation warning about GeometryType b90007a4 [gridcheck] Fix unhandled case in switch warning flagged by clang 5