Merge branch '2020-05-19-misc-fixes'
authorTom Rini <trini@konsulko.com>
Wed, 20 May 2020 12:22:17 +0000 (08:22 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 20 May 2020 12:22:17 +0000 (08:22 -0400)
- Assorted minor fixes


Trivial merge