WIP Instance: rename "generic daemon" to "cass daemon"

to make it clear these are managed directly by cassandane, and
not from the DAEMON section of cyrus.conf

XXX this is kind of confusing because these things DO listen on a
host:port like a cyrus SERVICE, and unlike a cyrus DAEMON

cassandane/Cassandane/Cyrus/Annotator.pm

@@ -78,7 +78,7 @@ sub start_my_instances
 {
     my ($self) = @_;
 
-    $self->{instance}->add_generic_daemon(
+    $self->{instance}->add_cass_daemon(
         name => 'annotator',
         port => $self->{instance}->{config}->get('annotation_callout'),
         argv => sub {

cassandane/Cassandane/Instance.pm

@@ -104,7 +104,7 @@ sub new
         starts => [],
         services => {},
         events => [],
-        generic_daemons => {},
+        cass_daemons => {},
         re_use_dir => 0,
         setup_mailbox => 1,
         persistent => 0,
@@ -465,23 +465,23 @@ sub add_event
     push(@{$self->{events}}, Cassandane::MasterEvent->new(%params));
 }
 
-sub add_generic_daemon
+sub add_cass_daemon
 {
     my ($self, %params) = @_;
 
     my $name = delete $params{name};
     die "Missing parameter 'name'"
         unless defined $name;
-    die "Already have a generic daemon named \"$name\""
-        if defined $self->{generic_daemons}->{$name};
+    die "Already have a cassandane daemon named \"$name\""
+        if defined $self->{cass_daemons}->{$name};
 
     my $daemon = Cassandane::GenericDaemon->new(
             name => $name,
             config => $self->{config},
             %params
     );
 
-    $self->{generic_daemons}->{$name} = $daemon;
+    $self->{cass_daemons}->{$name} = $daemon;
     return $daemon;
 }
 
@@ -491,7 +491,7 @@ sub set_config
 
     $self->{config} = $conf;
     map { $_->set_config($conf); } (values %{$self->{services}},
-                                    values %{$self->{generic_daemons}});
+                                    values %{$self->{cass_daemons}});
 }
 
 sub _find_binary
@@ -786,7 +786,7 @@ sub _generate_master_conf
         print MASTER "}\n";
     }
 
-    # $self->{generic_daemons} is daemons *not* managed by master
+    # $self->{cass_daemons} is daemons *not* managed by master
 
     close MASTER;
 }
@@ -908,7 +908,7 @@ sub _start_master
     # a second set of Cassandane tests on this machine, which is
     # also going to fail miserably.  In any case we want to know.
     foreach my $srv (values %{$self->{services}},
-                     values %{$self->{generic_daemons}})
+                     values %{$self->{cass_daemons}})
     {
         die "Some process is already listening on " . $srv->address()
             if $srv->is_listening();
@@ -942,7 +942,7 @@ sub _start_master
     xlog "_start_master: PID file present and correct";
 
     # Start any other defined daemons
-    foreach my $daemon (values %{$self->{generic_daemons}})
+    foreach my $daemon (values %{$self->{cass_daemons}})
     {
         $self->run_command({ cyrus => 0 }, $daemon->get_argv());
     }
@@ -953,7 +953,7 @@ sub _start_master
     # might be a bit slow.
     xlog "_start_master: PID waiting for services";
     foreach my $srv (values %{$self->{services}},
-                     values %{$self->{generic_daemons}})
+                     values %{$self->{cass_daemons}})
     {
         timed_wait(sub
                 {
@@ -1987,8 +1987,8 @@ sub describe
         printf "        ";
         $srv->describe();
     }
-    printf "    generic daemons:\n";
-    foreach my $daemon (values %{$self->{generic_daemons}})
+    printf "    cassandane daemons:\n";
+    foreach my $daemon (values %{$self->{cass_daemons}})
     {
         printf "        ";
         $daemon->describe();