CA124008, HFX-1226: Report out-of-space, not patch-invalid

Redo the pull request per Thomas' comments in #1821.