PEP8 fixes from PyLint
Extend pillar matcher to traverse nested dicts
Extend grains matcher to traverse nested dicts
Merge pull request #3414 from archtaku/issue3410

Implement #3410