Conflicts:
	objectstore/ArchiveQueueAlgorithms.cpp
	objectstore/GarbageCollector.cpp
	objectstore/Helpers.cpp
	objectstore/RetrieveRequest.cpp
	objectstore/RootEntry.cpp
	scheduler/OStoreDB/OStoreDB.cpp