Start the merging-rebase to v2.11.0-rc3

The upstream version v2.11.0 has been pushed back a few times, and is
now set to be released this coming Tuesday. That is close enough for Git
for Windows to hop on the v2.11 train: it is unlikely that we will need
to release a v2.10.3 before v2.11.0 comes out.

While at it, we use the chance to do a little bit of clean-up: some
patch series were ordered in a historically correct, if illogical
sequence, which has been fixed.

This commit starts the rebase of 1dd81a3 to 86fc2b7

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho