Fixed #23938 -- Added migration support for m2m to concrete fields and vice versa

Ticket: https://code.djangoproject.com/ticket/23938