12f03c Merge branch 'cboltz-water4' into 'production'

Merged and Committed by Christian Boltz a year ago
    Merge branch 'cboltz-water4' into 'production'
    
    Add wikisearch role to water4
    
    See merge request infra/salt!533