Migrate pillar_opts to false

to help this change along.
... todo: rebase when done

https://github.com/saltstack/salt/issues/16098