adding gazebo to upstream imports