Fix string prefix check
Allow custom grains to overwrite core grains
Merge pull request #14901 from Nibbler999/fix-custom-grains-override

Fix custom grains override