Fixed #21832 -- Added a way to create USERNAME_FIELD fk instance at command line.
Fixed test failures.