Schema changes for bare metal servers

Change-Id: I2aa01fc3b3db0c0e17c57bbe418a6a3d1b4dd8f8
Merge "Schema changes for bare metal servers"