Merge branch '14745-azure-cloud-driver-fixups'

refs #14745

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <eric.biagiotti@gmail.com>

diff --combined sdk/go/arvados/config.go
index 5491200cb39350b8ad9dcb79712b0e8bd93ed90a,522eb41a72ddf991349fb1074b3a474be53a923e..636cf350c151b150c59a96c45c312ea7af6d45c2
--- 1/sdk/go/arvados/config.go
--- 2/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@@ -100,7 -100,7 +100,7 @@@ type InstanceType struct 
  type Dispatch struct {
        // PEM encoded SSH key (RSA, DSA, or ECDSA) able to log in to
        // cloud VMs.
 -      PrivateKey []byte
 +      PrivateKey string
  
        // Max time for workers to come up before abandoning stale
        // locks from previous run
@@@ -143,7 -143,7 +143,7 @@@ type CloudVMs struct 
        ImageID string
  
        Driver           string
-       DriverParameters map[string]interface{}
+       DriverParameters json.RawMessage
  }
  
  type InstanceTypeMap map[string]InstanceType