Merge "Remove old configs for default_vm_number"