1e188d Merge branch 'lrupp/osc-collab-admins' into 'production'

Merged and Committed by lrupp 4 years ago
    Merge branch 'lrupp/osc-collab-admins' into 'production'
    
    - create osc-collab role for the new machine
    
    See merge request infra/salt!341