Adding schema changes and tests
Merge pull request #560 from wpreul/master

Adding schema changes for server settings validation