Fixed cvmfs_server broken in merge