merge again with CVM-1140 fix
merge again with CVM-1140 fix

DrDaveD/cvmfs,DrDaveD/cvmfs,Gangbiao/cvmfs,cvmfs/cvmfs,DrDaveD/cvmfs,cvmfs/cvmfs,cvmfs/cvmfs,djw8605/cvmfs,DrDaveD/cvmfs,cvmfs/cvmfs,DrDaveD/cvmfs,djw8605/cvmfs,DrDaveD/cvmfs,DrDaveD/cvmfs,djw8605/cvmfs,djw8605/cvmfs,cvmfs/cvmfs,Gangbiao/cvmfs,Gangbiao/cvmfs,Gangbiao/cvmfs,cvmfs/cvmfs,djw8605/cvmfs,cvmfs/cvmfs,Gangbiao/cvmfs