Merge branch 'allow_vm_name_to_use_project_name_or_id' of github.com:alex-leonhardt/nova into allow_vm_name_to_use_project_name_or_id

Conflicts:
	nova/compute/api.py
	nova/tests/compute/test_compute.py

Change-Id: I3d62b173b85d04c78d10c1fc43f735857bf6d4e7
Merge branch 'allow_vm_name_to_use_project_name_or_id' of github.com:alex-leonhardt/nova into allow_vm_name_to_use_project_name_or_id