Fix Save-AzureVMImage & Set-AzureVMImageOSDiskConfig

#2538 & #2537