fix leftover database stuff running migrator test
Merge remote-tracking branch 'origin/1.10' into 1.12

Conflicts:
	core/test-api/db/src/test/java/org/opennms/core/test/db/MigratorTest.java
Merge branch '1.12'