FIX: proper quoting in multiple modules
FIX: proper quoting, as custom grains value can contain single quote character
Merge pull request #9865 from hvnsweeting/hvn_fix_quotes

Fix quoting problem in multiple modules