Merge remote-tracking branch 'origin/master' into feature/framedBoxedLocations

source/RobotAPI/components/ArViz/CMakeLists.txt

.../armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp

source/RobotAPI/libraries/armem/client/Query.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

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

...otAPI/libraries/armem/core/base/detail/iteration_mixins.h

...RobotAPI/libraries/armem/core/base/detail/lookup_mixins.h

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

source/RobotAPI/libraries/armem/core/error/ArMemError.cpp

source/RobotAPI/libraries/armem/core/error/ArMemError.h

...e/RobotAPI/libraries/armem/core/wm/memory_definitions.cpp

source/RobotAPI/libraries/armem/core/wm/memory_definitions.h

...tAPI/libraries/armem/test/ArMemEntityInstanceDataTest.cpp

source/RobotAPI/libraries/armem/test/ArMemForEachTest.cpp

source/RobotAPI/libraries/armem/test/ArMemGetFindTest.cpp

source/RobotAPI/libraries/armem/test/CMakeLists.txt