Add field_name as a key on the _html_output dict

Updated patch and tests for https://code.djangoproject.com/ticket/5749