pull from upstream cvmfs into feature/overlayfs