b6b587 Merge branch 'hellcp/pillar' into 'production'

Merged and Committed by Christian Boltz 3 years ago
    Merge branch 'hellcp/pillar' into 'production'
    
    Update the pillar ids after tsp changes
    
    See merge request infra/salt!436