Merge "Sync robot_properties between HEAT and OOM"