Adding VM Error support
Merge branch 'vmr_branch' of https://github.com/criscad/horizon into vmr_branch

Conflicts:
	openstack_dashboard/dashboards/admin/sla/forms.py