Assert proper return types from state calls.

Just to be sure.
Stop passing `env`. Use `saltenv`.
Merge pull request #13380 from s0undt3ch/2014.1

2014.1