Merge ~ltrager/maas:lp1869116_2.7 into maas:2.7

[Lee Trager]

LP: #1869116 - Read storage model data from udev ID_MODEL_ENC. (gh:lxc/lxd:7665)

[Lee Trager (ltrager)]

Reviewed at https://github.com/lxc/lxd/issues/7665

review: Approve

diff --git a/src/machine-resources/src/machine-resources/Gopkg.lock b/src/machine-resources/src/machine-resources/Gopkg.lock
index afd1fb4..a754c82 100644
--- a/src/machine-resources/src/machine-resources/Gopkg.lock
+++ b/src/machine-resources/src/machine-resources/Gopkg.lock
@@ -2,33 +2,16 @@
 
 
 [[projects]]
-  name = "github.com/flosch/pongo2"
-  packages = ["."]
-  revision = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9"
-  version = "v3.0"
-
-[[projects]]
-  name = "github.com/gorilla/websocket"
-  packages = ["."]
-  revision = "b65e62901fc1c0d968042419e74789f6af455eb9"
-  version = "v1.4.2"
-
-[[projects]]
   name = "github.com/jaypipes/pcidb"
   packages = ["."]
   revision = "49e68a8beb0c155efb2db43bea4b354ec4843ff1"
   version = "0.5.0"
 
 [[projects]]
-  name = "github.com/juju/errors"
-  packages = ["."]
-  revision = "3fe23663418fc1d724868c84f21b7519bbac7441"
-
-[[projects]]
   branch = "master"
   name = "github.com/lxc/lxd"
-  packages = ["lxd/resources","shared","shared/api","shared/cancel","shared/ioprogress","shared/logger","shared/osarch","shared/units","shared/usbid","shared/version"]
-  revision = "6c2d0d039346d2e2b524e1b9bd207be182abe0a6"
+  packages = ["lxd/resources","shared/api","shared/units","shared/usbid"]
+  revision = "44487eda6756305828ea8aaf7555225f61d1d292"
 
 [[projects]]
   name = "github.com/mitchellh/go-homedir"
@@ -45,15 +28,9 @@
 [[projects]]
   branch = "master"
   name = "golang.org/x/sys"
-  packages = ["unix","windows"]
+  packages = ["unix"]
   revision = "b09406accb4736d857a32bf9444cd7edae2ffa79"
 
-[[projects]]
-  branch = "v2"
-  name = "gopkg.in/robfig/cron.v2"
-  packages = ["."]
-  revision = "be2e0b0deed5a68ffee390b4583a13aff8321535"
-
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1