Serverd fixes

This is the portion of my huge clean-ups branch that touches cf-serverd/, FAO @jimis.