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