updated patch 3 of 16340 to trunk

Proposed patch for 16340 (updated the patch on track to apply to trunk, use assertIn(x, y) instead of assertTrue(x in y)

https://code.djangoproject.com/ticket/16340