Fixed #20545 - Made class-based view MRO lists consistent.

Thanks wim@ for the suggestion.