tmp rename
Merging the rename of the avahi scripts

in preparation for a later merge.
Merge branch 'avahi_keyserver_rename' into avahi_keyserver