Merge ~ahasenack/ubuntu/+source/ubuntu-advantage-tools:bionic-uatools-fix-dep8-1757490 into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel

[Andreas Hasenack]

Also rename the motd path in the corresponding dep8 test.

[Nish Aravamudan (nacc)]

review: Approve

[Nish Aravamudan (nacc)]

Upload tagged and sponsored.

diff --git a/debian/changelog b/debian/changelog
index 9c328f7..bb95c3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ubuntu-advantage-tools (16) bionic; urgency=medium
+
+  * d/t/update-motd-run: fix path to the esm motd (LP: #1757490)
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 21 Mar 2018 13:58:34 -0300
+
 ubuntu-advantage-tools (15) bionic; urgency=medium
 
   * Rename motd scripts so they are shown a bit earlier (LP: #1757171)
diff --git a/debian/tests/update-motd-run b/debian/tests/update-motd-run
index c70fcf8..22b8010 100644
--- a/debian/tests/update-motd-run
+++ b/debian/tests/update-motd-run
@@ -5,7 +5,7 @@ set -ex
 # virgin system should not have esm enabled
 codename=`lsb_release -cs`
 description=`lsb_release -ds`
-motd_text=`/bin/sh /etc/update-motd.d/99-esm`
+motd_text=`/bin/sh /etc/update-motd.d/80-esm`
 
 if [ "$codename" = "precise" ]; then
 	echo $motd_text | grep "This ${description} system is past"