Gulf dispute over Qatar ends, envoys to return