Merge pull request #3334 from s0undt3ch/develop

Fix `tests.unit.pydsl_test` and `tests.unit.stateconf_test`.
Merge pull request #3335 from s0undt3ch/develop

Number of commits is not limited to 2 chars.
updated to add an example of other standard top matching types in pillar files.

Not sure if you'll like my example, but we should add at least one example of how to use other standard top matching types into the top.sls file.
Merge pull request #3336 from ydavid365/patch-1

updated to add an example of other standard top matching types in pillar...
Fix some of the formatting and use a stock grain so people don't

go looking for a non standard grain
`default_include` should also be checked against provided defaults.