079e06 Merge branch 'hellcp-configure-matrix' into 'production'

Merged and Committed by Christian Boltz 4 years ago
    Merge branch 'hellcp-configure-matrix' into 'production'
    
    Configure matrix
    
    See merge request infra/salt!326