Merge branch 'bring_back_empty_roles' into 'production'
    
    bring back the empty salt/role/*.sls roles as the macro is broken
    
    See merge request infra/salt!105