This commit passes compilation but not linking (yet) as several
methods are still commented out.

Conflicts:
	objectstore/Algorithms.hpp
	objectstore/AlgorithmsTest.cpp
	objectstore/ArchiveQueueAlgorithms.cpp
	objectstore/ArchiveQueueAlgorithms.hpp
	objectstore/ArchiveRequest.cpp
	objectstore/CMakeLists.txt
	objectstore/GarbageCollector.cpp
	objectstore/RetrieveQueueAlgorithms.hpp
	objectstore/RetrieveRequest.hpp
	scheduler/OStoreDB/OStoreDB.cpp