OZG-3328 resolve merge conflicts

src/main/helm/templates/_helpers.tpl

src/test/helm/deployment_defaults_labels_test.yaml

src/test/helm/deployment_test.yaml

src/test/helm/service_test.yaml