Set pillar-OPts to default to False
Set the tests to still asume pillar_opts
Merge pull request #16158 from thatch45/pillar_opts_false

Set pillar_opts to default to False