(cherry picked from commit 7c75160f590812f0c5d70fd9c68441068e2ded48) Conflicts: src/server/database/Database/Implementation/HotfixDatabase.h src/server/database/Database/QueryResult.cpp src/server/shared/DataStores/DB2StorageLoader.cpp src/server/shared/DataStores/DB2StorageLoader.h src/server/shared/DataStores/DB2Store.h