Fix grain PCRE/glob matching against dict-valued grains#69690

dwoz merged 2 commits into

saltstack:3006.xsaltstack/salt:3006.xfrom

ggiesen:fix-35567-grain-pcre-dictggiesen/salt:fix-35567-grain-pcre-dictCopy head branch name to clipboard