Updating unittests to pass against current Nova tip

Minor changes to ensure that the unittests continue to pass against
the later OpenStack nova project.

Change-Id: Icd4d65e8735f26386d2da7a1f882e34048449929
Copy over the network_info in the info_cache when copying instances.

In Havana the network_info must exist within the instance info
cache otherwise an error will occur when listing the instances because
core nova expects the value to be set.

Fixes issue OS-202

Change-Id: Iae30a3579ffec3c2beeb5e2201efa7dffa64f159
Use the new block device mapping format

Move the block device copying to use the new format introduced in
Havana.

Fixes OS-203

Change-Id: I8cbad215647334bfb796f3029e2c886136a97d55
Make it happen in Havana (trivial)

* Fix az handling, missing context
* s/instance_type_get/flavor_get, but not for conductor!

Change-Id: I1b57c33e8d10ed7da7bc27f5fe7cf2ab6352f437
Merge branch 'grizzly/1.4' into master

Change-Id: I893604332b80b20e112ef232e20928b66de04697
trivial updating gitreview to the correct branch

Change-Id: I16ed5bcdc6ea07dd3d940051e69f2c521d6cfb35
Havana removed passing in the conductor_api to get_instance_nw_info

Fixes OS-234

The interface changed to network_api.get_instance_nw_info(...) to
no longer take the conductor_api. This was used before because
the network_api method may access the database directly. Now the
method always makes an RPC call to the network manager to get this
information.

Change-Id: I417854d8893f0d5dae130ff99d9b0482eb040583
Instance objects cannot be easily turned into dictionaries

Fixes OS-235

The new nova instance objects cannot be easily converted into
dictionaries by passing them into the dict(...) constructor. This
uses their compatible iteritems() method to extract the key,value
pairs.

Change-Id: Ie4bf93e96473af8c2419d134acea666ba97bd84b
Merge "Instance objects cannot be easily turned into dictionaries" into havana/1.4
Network injection is no longer needs to be disabled.

Fixes OS-236

Network injection no longer occurs in OpenStack and as such we
no longer need to disable it when launching a new instance.

Change-Id: Ic1eab3457b910e1c273145ede4330de8567e4017
Libvirt driver to_xml(...) method now takes the context

Fixes OS-237

The libvirt driver method to_xml(...) now takes the context as
the first argument. Also removed the grizzly specific code that
handled the interface change between grizzly minor releases because
havana uses the newer version only.

Change-Id: I68998479dfe1c58bb5a90f37786aaae40b44b97e
Merge remote-tracking branch 'origin/havana/1.5' into havana15

Conflicts fixed:
	.gitreview

Change-Id: Icac80d6ed1daccf8bdf6bba596680ee904d08487