Fixed #6834 -- Added a dirs parameter to extends and include

template tags to override TEMPLATE_DIRS.

The ticket is here: https://code.djangoproject.com/ticket/6834