Start the merging-rebase to upstream/maint

This commit starts the rebase of 5c76d3c to b32fe95

While at it, a couple of patches were moved around, Philip Oakley's
changes to the issue reporting template were squashed into Brendan
Forster's original patch, and the GIT_SSH_COMMAND patch series was updated
to the latest (v4).

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

Author: dscho