Serverd fixes

This is the portion of my huge clean-ups branch that touches cf-serverd/, FAO @jimis.
heh - this is in fact a "clean" merge with @jimis's change last night - I'm glad I did a rebase and test-compiled !