Make it a dictionary, not a `set()`(py >= 2.7).
Let's see if PyLint stops complaining.
Merge branch 'develop' of github.com:saltstack/salt into develop