Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: Honour {httpd,sshd}.gracefulStopTimeout in gerrit.sh Elasticsearch: Discontinue EOL version 7.5 support Change-Id: I9f8ee9c5a764c651e3d5b8e2607d7a5f50cb7216