Merge branch '2019-06-20-master-imports'
authorTom Rini <trini@konsulko.com>
Fri, 21 Jun 2019 01:52:31 +0000 (21:52 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 21 Jun 2019 01:52:31 +0000 (21:52 -0400)
- Assorted minor fixes


Trivial merge