4b4449 Merge branch 'valid_custom_grains_postmerge' into 'production'

Merged and Committed by Thorsten Bro 6 years ago
    Merge branch 'valid_custom_grains_postmerge' into 'production'
    
    bin/get_valid_custom_grains.py: minor improvement based on cboltz comment
    
    See merge request infra/salt!177