Fix bad ref from double del()

Conflicts:
	salt/client.py
Merge branch '0.14' of github.com:saltstack/salt into 0.14