[1.6.x] Fixed #21410 -- prefetch_related() for ForeignKeys with related_name='+'
Regression introduced by commit 97774429.
Thanks to trac username troygrosfield for the report and test case.
Backpatch of cb834488 from master.
Conflicts:
tests/prefetch_related/models.py