XD-2181 Add configuration options to servers.yml

* Add configuration options to servers.yml
* Update test configurations to use the scheme suggested in servers.yml