Convert Server to new Schema format

blueprint property-schema-conversion

Change-Id: I2da66244760f782e774b332b07b08e526ce5a7ba
Merge "Convert Server to new Schema format"