Repair regressions from repairing "ugly"

https://github.com/saltstack/salt/commit/879a0a083b10963eb58da6b5ea17fcf4c7626fa4

- dict.update returns None
- dict.get with default is logically differnt from the original boolean test