TEIIDDES-2069 Improve Default Server naming and make it consistent
Merge pull request #338 from mdrillin/TEIIDDES-2069

TEIIDDES-2069 Improve Default Server naming and make it consistent