OF-807: S2S server name format
OF-807: S2S server name format

Per PR review feedback.

guusdk/Openfire,akrherz/Openfire,Gugli/Openfire,akrherz/Openfire,igniterealtime/Openfire,GregDThomas/Openfire,igniterealtime/Openfire,akrherz/Openfire,GregDThomas/Openfire,guusdk/Openfire,guusdk/Openfire,akrherz/Openfire,igniterealtime/Openfire,speedy01/Openfire,akrherz/Openfire,GregDThomas/Openfire,speedy01/Openfire,speedy01/Openfire,igniterealtime/Openfire,speedy01/Openfire,Gugli/Openfire,Gugli/Openfire,guusdk/Openfire,igniterealtime/Openfire,Gugli/Openfire,Gugli/Openfire,GregDThomas/Openfire,GregDThomas/Openfire,speedy01/Openfire,guusdk/Openfire