I had marked some bugs as fixed in 25.2 and pushed to master because I
didn't know at the time it was going to be 26.  I think there were some
others working under the same assumption, so I've gathered those fixes
to backport in a semi-automated fashion by searching commit messages in
the range emacs-25..master for non-wishlist bugs marked fixed in 25.2,
here is the code: