Updated openstack/openstack
Project: openstack/horizon  151fe9dec8cff491e8ef9f3c8fd702984c359acf
null
Fix django.conf.urls.defaults imports

These imports aren't available in Django 1.6. We need to use
django.conf.urls instead.

Partially-implements blueprint django-1point6

Change-Id: I692439a76de4fe5abff9ab9395bad5c10f1cdbba