Fixed #20812 -- Error out if __unicode__/__str__ doesn't return a text type.
re-indented method documentation within RelatedManager
Merge branch 't20812'
Merge pull request #1567 from technivore/ticket_20970

re-indented method documentation within RelatedManager
Update test utils_tests/test_html.py for python3