Remove leftovers of django.conf.urls.defaults

    Partially-implements blueprint django-1point6

Change-Id: Ib8a19f47f0cc69003e9622942dfc5bababe3c6f2
Translating entity types in network topology

Change-Id: I4f4e2898f18e994e7fdd29fdb1a478d461313e83
Partial-bug: #1226159
'Update' options for VPNaaS UI

Adds 'Update' options for Neutron VPNaaS Horizon Support.

Implements blueprint vpnaas-ui-update.

Change-Id: I4f9b5726dcf5fe0ee2f066a6155eeed502c8141f
Merge "Remove leftovers of django.conf.urls.defaults"
Merge "Translating entity types in network topology"
Merge "'Update' options for VPNaaS UI"