resolve @fqrn@
Merge branch 'master' of github.com:cvmfs/cvmfs