Update moveit_config to match with setup_assistant