Use None, not empty dict in function definition
Send {} if grains is None
Merge pull request #6911 from UtahDave/fix_pillar

Fix pylint warning about {} in argument default.