US87, US94

* US87: As an admin, I want to see a list of extra specs for volumes types
* US94: As an admin, I want to set or unset extra specs for volume types
US88, US89, US90

* US88: As an admin, I want to attempt forced removal of a volume
    regardless of its state
* US89: As an admin, I want to set or delete metadata on a volume
* US90: As an admin, I want to rename a volume and edit its description
* US90 additional: As a user, I want to rename a volume and edit its
    description

Conflicts:
	openstack_dashboard/dashboards/admin/volumes/tables.py
	openstack_dashboard/dashboards/admin/volumes/urls.py
	openstack_dashboard/dashboards/project/volumes/tests.py
Extend cinder api support with volume_update
Project user and admin user can edit volume info

Conflicts:
	openstack_dashboard/dashboards/admin/volumes/tables.py
	openstack_dashboard/dashboards/admin/volumes/urls.py
	openstack_dashboard/dashboards/project/volumes/tests.py
Merge branch 'master' into batch-4

Conflicts:
	openstack_dashboard/api/cinder.py
PEP 8 and test fixes
Merge branch 'batch-4' into dev

Conflicts:
	openstack_dashboard/dashboards/admin/volumes/tables.py
	openstack_dashboard/dashboards/admin/volumes/urls.py
	openstack_dashboard/dashboards/admin/volumes/views.py
	openstack_dashboard/dashboards/project/volumes/urls.py
Only one import per line

* Only one import per line
* Only one import per line
* Only one import per line