Merge ~ltrager/maas:lp1869116_2.8 into maas:2.8

[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

[MAAS Lander (maas-lander)]

LANDING
-b lp1869116_2.8 lp:~ltrager/maas/+git/maas into -b 2.8 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7987/consoleText

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1869116_2.8 lp:~ltrager/maas/+git/maas into -b 2.8 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 5567d11301933acb6664d717d513ec5ceec4368f

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1869116_2.8 lp:~ltrager/maas/+git/maas into -b 2.8 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/7989/consoleText

diff --git a/src/machine-resources/src/machine-resources/Gopkg.lock b/src/machine-resources/src/machine-resources/Gopkg.lock
index 9261f09..52abaeb 100644
--- a/src/machine-resources/src/machine-resources/Gopkg.lock
+++ b/src/machine-resources/src/machine-resources/Gopkg.lock
@@ -23,7 +23,7 @@
   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"
+  revision = "44487eda6756305828ea8aaf7555225f61d1d292"
 
 [[projects]]
   name = "github.com/mitchellh/go-homedir"
@@ -41,7 +41,7 @@
   branch = "master"
   name = "golang.org/x/sys"
   packages = ["internal/unsafeheader","unix","windows"]
-  revision = "05986578812163b26672dabd9b425240ae2bb0ad"
+  revision = "ddb9806d33aed8dbaac1cd6f1cba58952e87f933"
 
 [[projects]]
   branch = "v2"