(cherry picked from commit 2332da147b) Conflicts: mercurial/.footprint mercurial/.md5sum mercurial/Pkgfile
2332da147b