Merge remote-tracking branch 'os/stable/havana' into cis-havana-staging

Conflicts:
	horizon/static/horizon/js/horizon.instances.js
	horizon/tables/base.py
	openstack_dashboard/dashboards/admin/groups/tables.py
	openstack_dashboard/dashboards/admin/users/tables.py
	openstack_dashboard/dashboards/project/stacks/tabs.py