pillar_opts defaults to False in develop now
Merge pull request #16718 from UtahDave/develop

pillar_opts defaults to False in develop now