Fix missing "promise kept" status for the last line in a file.

For the last line we shortcut out using MatchRegion, but previously
we did not set the promise status.

Fixes issue 2943.
(cherry picked from commit b626ba47d5243894bd7cd25d17cc15ff023007d9)
Update ChangeLog with fix for 2943
Fix "changes" promise not receiving status when file is missing.

Fixes issue 2820.
(cherry picked from commit 14facb9b97581ff756d2b94429770ed0113dae8a)
Update ChangeLog with fix for 2820
Merge remote-tracking branch 'upstream/3.5.x' into 3.5_surfsara
Revert "Fix missing "promise kept" status for the last line in a file."

This reverts commit b6475a3a252544cc41571a9714ed3add922fa57e.
Not fixed after all, change caused test failures
Merge remote-tracking branch 'upstream/3.5.x' into 3.5_surfsara