7f6ac3 Merge branch 'man-vm' into 'production'

Merged and Committed by Christian Boltz a year ago
    Merge branch 'man-vm' into 'production'
    
    Init man
    
    See merge request infra/salt!587