Fix Requests Method for Alarms and Power Saving
Fix Requests Method for Alarms and Upgrade
Merge branch 'master' into new-apis

Conflicts:
	openstack_dashboard/dashboards/admin/alarms/tables.py