Merge "Move deployment-specific templates to parent chart"