Fix application of additional patches after failed patch
Created by: craftyguy
If one patch fails to apply, it leaves the repo in a state that causes application of additional patches to fail. This cleans things up after the failure to that subsequent patches have a chance to apply