Merge branch 'master' of ssh://github.com/hashicorp/packer into scrape_doc_to_builder_struct_config

builder/azure/arm/builder.go

@@ -439,8 +439,9 @@ func getObjectIdFromToken(ui packer.Ui, token *adal.ServicePrincipalToken) strin
 		ui.Error(fmt.Sprintf("Failed to parse the token,Error: %s", err.Error()))
 		return ""
 	}
-	return claims["oid"].(string)
 
+	oid, _ := claims["oid"].(string)
+	return oid
 }
 
 func normalizeAzureRegion(name string) string {

builder/qemu/step_run.go

@@ -96,6 +96,9 @@ func getCommandArgs(bootDrive string, state multistep.StateBag) ([]string, error
 		return nil, err
 	}
 	qemuVersion, err := version.NewVersion(rawVersion)
+	if err != nil {
+		return nil, err
+	}
 	v2 := version.Must(version.NewVersion("2.0"))
 
 	if qemuVersion.GreaterThanOrEqual(v2) {