735404 Merge branch 'add-water3.i.o.o' into 'production'

Merged and Committed by Martin Čaj 4 years ago
    Merge branch 'add-water3.i.o.o' into 'production'
    
    add water3 into salt control
    
    See merge request infra/salt!248