Changes ClusterSettings.server_id to be an InstanceId instead of an integer
Merge pull request #2353 from digitalstain/1.9-maint

Changes ClusterSettings.server_id to be an InstanceId instead of an integer