Merge branch 'master' of gitlab.switch.ch:memoriav/memobase-2020/libraries/mapper-service-configuration
