Centralize minion validation
Merge pull request #2329 from derekwaynecarr/validate_minion

Centralize minion validation