Sync with CVMFS

Merged Kalana Wijethunga requested to merge dev into master

Merge request reports