Merge pull request #4273 from JosJuice/traversal-server-label DolphinWX: Less duplication in code related to traversal server label
