saltstack/salt — pull request #14901 by Nibbler999 (2014-08-11 20:33:17+00:00)
Title: Fix custom grains override

Fixes #14863.