Add patch 0001-restore-missing-changes-from-0.20.0.22.patch.

Between the 0.23 and 0.25 releases, changes from the 0.20..0.22 releases
were somehow lost. This patch restores them again.

Thanks: Eric Wong for reporting the issue and providing the patch.
Closes: #760336