ee35d6 Merge branch 'cboltz-water4' into 'production'

Merged and Committed by Christian Boltz 2 years ago
    Merge branch 'cboltz-water4' into 'production'
    
    add pillar/id/water4
    
    See merge request infra/salt!525