* *: migrate to per-model UUID Primary key, remove UUIDModel * *: fix import order, fix unittests
This reverts commit 7ed3ceb960.
7ed3ceb960