Merge branch 'stable-3.11' into stable-3.12

* stable-3.11:
  Properly cleanup site3

Change-Id: I6e2a52d2038ce67a0d11c82edc9e60ac3aff3379

setup_local_env/setup.sh

diff --git a/setup_local_env/setup.sh b/setup_local_env/setup.sh
index 06fd7c7..d7ab200 100755
--- a/setup_local_env/setup.sh
+++ b/setup_local_env/setup.sh
@@ -225,9 +225,10 @@
   echo "Stopping GERRIT instances"
   $1/bin/gerrit.sh stop 2> /dev/null
   $2/bin/gerrit.sh stop 2> /dev/null
+  $3/bin/gerrit.sh stop 2> /dev/null
 
-  echo "REMOVING setup directory $3"
-  rm -rf $3 2> /dev/null
+  echo "REMOVING setup directory $4"
+  rm -rf $4 2> /dev/null
 }
 
 function check_if_container_is_running {