Merge branch 'SPI-2006' into 'master'

Mount and unmount CVMFS when needed

Closes SPI-2006

See merge request !973
4 jobs for master in 7 minutes and 12 seconds