* Add the name of the jobset to ReleaseSetJobs, otherwise we can't

distinguish between jobs with the same name in different jobsets
  (e.g. "trunk" vs "stdenv-branch" for Nixpkgs).
* Renamed the "attrName" field of Builds to "job".
* Renamed the "id" field of BuildSteps to "build".

src/script/hydra_queue_runner.pl

@@ -106,7 +106,7 @@ sub checkBuilds {
     # outside the transaction in case it aborts or something.
     foreach my $build (@buildsStarted) {
         my $id = $build->id;
-        print "starting build $id (", $build->project->name, ":", $build->attrname, ") on ", $build->system, "\n";
+        print "starting build $id (", $build->project->name, ":", $build->job, ") on ", $build->system, "\n";
         eval {
             my $logfile = $build->schedulingInfo->logfile;
             my $child = fork();
@@ -134,6 +134,12 @@ sub checkBuilds {
 }
 
 
+if (scalar(@ARGV) == 1 && $ARGV[0] eq "--unlock") {
+    unlockDeadBuilds;
+    exit 0;
+}
+
+
 while (1) {
     eval {
         # Clean up zombies.