Merge commit 'origin/master' into recoveryinfra

Conflicts:

src/backend/access/transam/xlog.c
src/backend/postmaster/postmaster.c
src/include/storage/pmsignal.h

diff --cc src/backend/access/transam/xlog.c
index 747379f61e4b9a87cb8575df61dd572a93fe375b,97fb14868a44f9c0960860506f4fb38f62195596..bc8372ce3a1522f6db1dd4efc945e7b231bcc2a7
--- 1/src/backend/access/transam/xlog.c
--- 2/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@@ -2818,7 -2818,7 +2818,7 @@@ RestoreArchivedFile(char *path, const c
         * On SIGTERM, assume we have received a fast shutdown request, and exit
         * cleanly. It's pure chance whether we receive the SIGTERM first, or the
         * child process. If we receive it first, the signal handler will call
-        * proc_exit(1), otherwise we do it here. If we or the child process
 -       * proc_exit(0), otherwise we do it here. If we or the child process
++       * proc_exit, otherwise we do it here. If we or the child process
         * received SIGTERM for any other reason than a fast shutdown request,
         * postmaster will perform an immediate shutdown when it sees us exiting
         * unexpectedly.