Conflicts:
	common/Murmur3.hh
	console/commands/com_fusex.cc
	fusex/cap/cap.cc
	fusex/data/cache.cc
	fusex/data/memorycache.cc
	fusex/md/md.cc
	mgm/FuseServer.cc
	mgm/XrdMgmOfsFile.cc
	mgm/ZMQ.cc
	mgm/proc/user/File.cc
	mgm/proc/user/Ls.cc
	namespace/ContainerMD.cc
	namespace/ContainerMD.hh
	namespace/accounting/FileSystemView.hh
	namespace/persistency/ChangeLogContainerMDSvc.cc
	namespace/persistency/ChangeLogContainerMDSvc.hh
	namespace/persistency/ChangeLogFileMDSvc.cc
	namespace/persistency/ChangeLogFileMDSvc.hh