Resolved merge conflict by using new cmake file in armem/server

data/RobotAPI/VariantInfo-RobotAPI.xml

data/RobotAPI/robotStateMemoryConfig.txt

scenarios/ArMemExample/ArMemExample.scx

scenarios/ArMemExample/config/ArMemMemoryNameSystem.cfg

scenarios/ArMemExample/config/ExampleMemory.cfg

scenarios/ArMemExample/config/ExampleMemoryClient.cfg

scenarios/ArMemExample/config/MemoryNameSystem.cfg

scenarios/ArMemObjectMemory/ArMemObjectMemory.scx

scenarios/ArMemObjectMemory/config/ObjectMemory.cfg

...rios/ArMemObjectMemory/config/ObjectPoseClientExample.cfg

scenarios/ArMemObjectMemory/config/global.cfg

...s/ObjectPoseObserverExample/ObjectPoseObserverExample.scx

scenarios/ObjectPoseObserverExample/config/DebugObserver.cfg

...s/ObjectPoseObserverExample/config/ObjectPoseObserver.cfg

...tPoseObserverExample/config/ObjectPoseProviderExample.cfg

...ObjectPoseObserverExample/config/RemoteGuiProviderApp.cfg

.../ObjectPoseObserverExample/config/RobotStateComponent.cfg

...rios/ObjectPoseObserverExample/config/RobotToArVizApp.cfg

scenarios/ObjectPoseObserverExample/config/global.cfg

source/RobotAPI/components/ArViz/Client/Elements.cpp