Merge branch 'master' into qa

SiteTests/testjob/tests/CE-cms-singularity-wrapper

@@ -9,6 +9,9 @@ echo "SAME_SENSOR_HOME = ${SAME_SENSOR_HOME}"
 echo "PATH = ${PATH}"
 /bin/ls -l /cvmfs/cms.cern.ch/SITECONF/local || true
 
+echo "Unsetting SCRAM_ARCH..."
+unset SCRAM_ARCH
+
 # Argument is the name of the test to run inside singularity
 TEST_SCRIPT=$1