5260e1 Merge branch 'lrupp/osc-collab-admins' into 'production'

Merged and Committed by lrupp 4 years ago
    Merge branch 'lrupp/osc-collab-admins' into 'production'
    
    fix hostusage for osc-collab machines
    
    See merge request infra/salt!342