Merge "add test for updating server's disk_config test"