Don't define __opts__ and __pillar__ in the module

Also shorten a line
Merge pull request #8806 from UtahDave/develop

Don't define __opts__ and __pillar__ in the module