Re-fixed #21554 - Properly look up which table columns are on during multiple inheritance

For Issue #21554 - https://code.djangoproject.com/ticket/21554