Merge branch '2020-01-02-master-imports'
authorTom Rini <trini@konsulko.com>
Thu, 2 Jan 2020 15:27:47 +0000 (10:27 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 2 Jan 2020 15:27:47 +0000 (10:27 -0500)
- Assorted test.py fixes
- Other minor changes


Trivial merge