[backport] Backport fixes from master to elements-22.x for rc4#1147

apoelstra merged 11 commits into

ElementsProject:elements-22.xElementsProject/elements:elements-22.xfrom

psgreco:elements-22-rc4psgreco/elements:elements-22-rc4Copy head branch name to clipboard