Fix more merge bugs

pkg/archive/fsBackend.go

@@ -341,8 +341,6 @@ func (fsa *FsArchive) ImportJob(
 	}
 	if err := f.Close(); err != nil {
 		log.Warn("Error while closing data.json file")
-		return err
-
 	}
-	return f.Close()
+	return err
 }

test/integration_test.go

@@ -494,7 +494,6 @@ func TestRestApi(t *testing.T) {
 	}
 
 	const stopJobBody string = `{
-        "jobId":     123,
         "jobId":     123,
 		"startTime": 123456789,
 		"cluster":   "testcluster",