Fixed #17673 -- forbidding field shadowing

Now the patch applies clearly. The old pull request is: https://github.com/django/django/pull/556