Function parity between pillar and grains modules

Fixes #6127.