Pushed to emacs-26 [1: 8a1576cc03], and merged to master (it needed some
manual conflict resolution [2: 962547791e]).

[1: 8a1576cc03]: 2018-06-10 17:57:50 -0400
  Fix term.el cursor movement at bottom margin (Bug#31690)
  https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=8a1576cc03963138d62c42bd373226e58f9f17c6

[2: 962547791e]: 2018-06-10 18:47:27 -0400
  Merge from emacs-26
  https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=962547791e6ea16b18512e6b933a5317c464da26