Fix default opts handling
Fix default opts handling

Starting in 2017.7 the dunder dicts are handled differently in unit
tests.

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt