Merge branch 'feature8170' into 'master'

Feature 8170: Helm-based OSM installation

See merge request !133