Merge "Replace YAML comments with helm comments in templates"