Merge remote branch 'central/master'

protogeni/lib/GeniCM.pm.in

@@ -4063,7 +4063,7 @@ sub CheckCredential($)
 
 sub CheckTicket($)
 {
-    my $ticket = GeniCredential->CreateFromSignedTicket($_[0]);
+    my $ticket = GeniTicket->CreateFromSignedTicket($_[0]);
     if (!defined($ticket)) {
 	return GeniResponse->Create(GENIRESPONSE_ERROR, undef,
 				    "Could not create ticket object");

tbsetup/libossetup.pm.in

@@ -466,8 +466,7 @@ sub LightUpNodes($@)
 	    $reconfigs{$node_id} = $node;
 	    $action = "reconfiged";
 	}
-	print STDERR "$node_id will be $action\n"
-	    if ($self->debug());
+	print STDERR "$node_id will be $action\n";
     }
 
     # XXX Caller wants a list.