Merge "Fix image/server schema for 'OS-DCF:diskConfig'"