[1.7.x] Fixed a deprecation warning on Python 3.

Backport of c19bbefca2 from master
[1.7.x] Skipped a test that errors rather than marked it as an expectedFailure.

The test throws an error which Python 3.4 doesn't seem to catch as an
expectedFailure.

refs 7476d96f83a004d674244aeb7a66289035427396

Backport of c170c3761b from master
[1.7.x] Fixed #21941 -- Documented the kwargs param of django.conf.urls.url().

Thanks cjerdonek for the report.

Backport of a779757706 from master