Fixed #22811 -- Allowed setting both the old and new TEST database settings.

https://code.djangoproject.com/ticket/22811
python3 tests failed because `six.iteritems(old_test_settings)`.