Merge branch 'recommended-and-custom-labels' into 'master'

Feature:  Add Helm recommended labels and allow for custom labels on resources

See merge request gitlab-org/cluster-integration/auto-deploy-image!163