Merge branch 'master' into v7.0 22/8922/1 v7.1.0rc1
authorbeierlm <mark.beierl@canonical.com>
Sat, 16 May 2020 00:41:16 +0000 (20:41 -0400)
committerbeierlm <mark.beierl@canonical.com>
Sat, 16 May 2020 00:43:30 +0000 (20:43 -0400)
Change-Id: I48a508a25fb86c3c2ce480b24053aded97a56f85
Signed-off-by: beierlm <mark.beierl@canonical.com>

Trivial merge