Conflicts:
	objectstore/Agent.cpp
	objectstore/RetrieveQueueFailedAlgorithms.cpp
	objectstore/RetrieveQueueToReportAlgorithms.cpp
	objectstore/RetrieveRequest.cpp
	scheduler/OStoreDB/OStoreDB.cpp
	scheduler/OStoreDB/OStoreDB.hpp
	scheduler/OStoreDB/OStoreDBFactory.hpp
	scheduler/OStoreDB/QueueItor.cpp
	scheduler/RetrieveMount.cpp
	scheduler/Scheduler.cpp
	scheduler/SchedulerDatabase.hpp
	xroot_plugins/XrdCtaArchiveFileLs.hpp
	xroot_plugins/XrdCtaListPendingQueue.hpp
	xroot_plugins/XrdCtaTapePoolLs.hpp