452655 Merge branch '20171007_dvocc17' into 'production'

Merged and Committed by Thorsten Bro 6 years ago
    Merge branch '20171007_dvocc17' into 'production'
    
    dvocc17 test
    
    See merge request infra/salt!65
        
file modified
+2 -0