Allow versioning of server configs (#3515)

Commit 82a883089f pushed by mart-wmaster