Merge "Handle deleted instance types." into grizzly/1.3
Empty merge to harmonize grizzly/1.3 with grizzly/1.4

Change-Id: I64da24dae946d5275810f8a50de4ba854c1c9f1f
Use instance_type information stored in instance's system_metadata

Fixes OS-250

The instance_type/flavor is not a reliable source of information
because it can be deleted after an instance has been created from
it. However, all of the instance_type/flavor information is stored
in an instance's system_metadata. The core nova-compute process
uses the system_metadata to reconstruct the instance_type/flavor
when required.

Now cobalt-compute also uses the instance's system_metadata.

Change-Id: I541aa30b845cb1e752e439ec267bc89dbe55d9e6
Merge 'Use flavor information stored in system_metadata (OS-250)' into havana/1.4

Conflicts:
	bin/cobalt-compute
	cobalt/nova/api.py
	cobalt/tests/test_manager.py
	cobalt/tests/utils.py

Change-Id: I57f5a94cd9327b3263af44f55486c81a60c07ba8