Merge branch 'armem/dev' into armem/use-prior-knowledge-data

scenarios/dasd/config/DynamicObstacleManager.cfg

scenarios/dasd/config/ObstacleAwarePlatformUnit.cfg

scenarios/dasd/config/global.cfg

scenarios/dasd/dasd.scx

...ponents/DynamicObstacleManager/DynamicObstacleManager.cpp

source/RobotAPI/interface/armem/query.ice

...s/DMPController/NJointTaskSpaceImpedanceDMPController.cpp

source/RobotAPI/libraries/armem/client/query/Builder.cpp

source/RobotAPI/libraries/armem/client/query/Builder.h

source/RobotAPI/libraries/armem/core/Commit.cpp

source/RobotAPI/libraries/armem/core/Commit.h

source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h

source/RobotAPI/libraries/armem/core/base/EntityBase.h

...e/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h

...e/RobotAPI/libraries/armem/core/base/EntitySnapshotBase.h

source/RobotAPI/libraries/armem/core/base/MemoryBase.h

.../RobotAPI/libraries/armem/core/base/ProviderSegmentBase.h

...PI/libraries/armem/core/base/detail/EntityContainerBase.h

...obotAPI/libraries/armem/core/base/detail/MaxHistorySize.h

...PI/libraries/armem/core/base/detail/MemoryContainerBase.h