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

https://code.djangoproject.com/ticket/22811
As noted above, adding a similar test with 
```python
            'test-deprecation': {
                'TEST': {},
                'TEST_CREATE': None,
            },
```
would be helpful