[WFCORE-443] When an overridable directory is defined in the system prop...

...erties and the directory grouping is set to by-server (the default) ensure the server name is appended to the directory.