Also fixes extraneous white space at end of record when there are no rendezvous servers. (cherry picked from commit 78db46d7)