3c451d Merge branch 'firewall-slimhat' into 'production'

Merged and Committed by Karol Babioch 4 years ago
    Merge branch 'firewall-slimhat' into 'production'
    
    Use and instead of ampersand in description of firewalld service
    
    See merge request infra/salt!284