Merge branch 'stable-3.10' into stable-3.11

* stable-3.10:
  Properly cleanup site3

Change-Id: I2f4ee4c6d740a11828706ddc53fc4655452e5354

setup_local_env/setup.sh

diff --git a/setup_local_env/setup.sh b/setup_local_env/setup.sh
index bab281a..3e79f14 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 {