Sync with maint

* maint:
  Almost ready for 2.8.3

Documentation/RelNotes/2.8.3.txt

@@ -58,4 +58,13 @@ Fixes since v2.8.2
    See http://thread.gmane.org/gmane.comp.version-control.git/291853
    and http://thread.gmane.org/gmane.comp.version-control.git/275680.
 
+ * "git replace -e" did not honour "core.editor" configuration.
+
+ * Upcoming OpenSSL 1.1.0 will break compilation b updating a few APIs
+   we use in imap-send, which has been adjusted for the change.
+
+ * "git submodule" reports the paths of submodules the command
+   recurses into, but this was incorrect when the command was not run
+   from the root level of the superproject.
+
 Also contains minor documentation updates and code clean-ups.