Merge branch 'master' into armem/robot-state-memory

source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.cpp

source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.h

source/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.cpp

...nterface/units/RobotUnit/NJointTaskSpaceDMPController.ice

...obotAPI/libraries/RobotAPIComponentPlugins/CMakeLists.txt

...ies/RobotAPIComponentPlugins/HeartbeatComponentPlugin.cpp

...aries/RobotAPIComponentPlugins/HeartbeatComponentPlugin.h

...s/DMPController/NJointTaskSpaceImpedanceDMPController.cpp

...ers/DMPController/NJointTaskSpaceImpedanceDMPController.h

source/RobotAPI/libraries/armem/client/Query.h

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

...otAPI/libraries/armem/core/longtermmemory/CoreSegment.cpp

...e/RobotAPI/libraries/armem/core/longtermmemory/Entity.cpp

...PI/libraries/armem/core/longtermmemory/EntitySnapshot.cpp

...e/RobotAPI/libraries/armem/core/longtermmemory/Memory.cpp

source/RobotAPI/libraries/armem/core/longtermmemory/Memory.h

...I/libraries/armem/core/longtermmemory/ProviderSegment.cpp

...ce/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp

...ies/armem/server/query_proc/base/BaseQueryProcessorBase.h

...s/armem/server/query_proc/base/MemoryQueryProcessorBase.h