Merge pull request #11612 from s0undt3ch/2014.1

Call `super()` instead.
Merge pull request #11614 from s0undt3ch/2014.1

Load any YAML'able parameters.
Merge pull request #11618 from s0undt3ch/2014.1

Test cherry pick and CLI YAML parse fix
Merge pull request #11623 from s0undt3ch/2014.1

Don't YAML'ify empty strings to `None`
Provide `env` to templates.

Map `env` to the same value of `saltenv` in the templating context until
`env` is fully deprecated in favor of `saltenv`.

Fixes #11480.
Merge pull request #11641 from s0undt3ch/hotfix/env-in-jinja-context-2014.1

Provide `env` to templates.
Remove extra white-space