Merge branch 'master' into untyped-attributes

data/RobotAPI/VariantInfo-RobotAPI.xml

source/RobotAPI/components/ArViz/Client/elements/Line.cpp

source/RobotAPI/components/ArViz/Client/elements/Line.h

source/RobotAPI/components/ArViz/Client/elements/Path.h

...ectLocalizerExample/ArticulatedObjectLocalizerExample.cpp

...bjectLocalizerExample/ArticulatedObjectLocalizerExample.h

...nents/ObjectPoseClientExample/ObjectPoseClientExample.cpp

...ce/RobotAPI/components/RobotState/RobotStateComponent.cpp

source/RobotAPI/components/RobotToArViz/RobotToArViz.cpp

...I/components/armem/server/ExampleMemory/ExampleMemory.cpp

...API/components/armem/server/ExampleMemory/ExampleMemory.h

...nts/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp

...otAPI/components/armem/server/GraspMemory/GraspMemory.cpp

...obotAPI/components/armem/server/GraspMemory/GraspMemory.h

...API/components/armem/server/ObjectMemory/ObjectMemory.cpp

...otAPI/components/armem/server/ObjectMemory/ObjectMemory.h

...onents/armem/server/RobotStateMemory/RobotStateMemory.cpp

...mponents/armem/server/RobotStateMemory/RobotStateMemory.h

...ents/skills/SkillProviderExample/SkillProviderExample.cpp

source/RobotAPI/components/units/ForceTorqueUnit.h