overstate: Patching to fail on requisite failures.
Merge branch '0.17' of github.com:saltstack/salt into 0.17