Mercurial 2.5

Closes #17578.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>