overstate: Patching to fail on requisite failures.
Merge pull request #7675 from Caustic/overstate-patch

overstate: Patching to fail on requisite failures.