[WFCORE-225] Use the domain properties instead of the server properties
Merge pull request #386 from jamezp/WFCORE-225

[WFCORE-225] Use the domain properties instead of the server properties