Added param docs to grains.filter_by
Improved grains.filter_by usage example with multiple lookups
Added flag to allow overriding the grains.filter_by dict with Pillar
Merge pull request #6749 from whiteinge/filter_by-override

Allow filter_by to be overridden by pillar values