Fixed a merge error where instance_uuid was passed into instance_update

OS-272

In Havana, with instance now being full objects instead of dictionaries,
instance_update was modified to work on the instance_obj. Needed to update
one of the lines merged in that still passed in the instance_uuid instead
of the object to instance_update.

Added more unit tests so that network interaction was better tested and
was able to expose this failing code path.

Change-Id: I9f9408b377c72d9bc6469c8840bbbcb95d8b99be
Retry the vmsctl discard command on errors

OS-266

Immediately after migrating an launched instance there is some
cool-down period where the blessed instance cannot be discarded.
This updates cobalt to do a better-effort to discard a blessed
instance by retrying a couple times.

Change-Id: I6e8598ca6907f2d3af73e09b42b6575cb79b13a5
Merge 'Retry vmsctl discard on errors (OS-266)' into havana/1.5

Conflicts:
	cobalt/nova/extension/manager.py

Change-Id: Ic4820ba63b0fa80179fe4077c840caee671bf322
Add the instnace uuid in the deleted blessed instance error msg

OS-273

Include the instance uuid in the error message returned from the API
when a blessed instance is attempted to be deleted instead of discarded.

Change-Id: Id577c908e4951586608cfd3791f305b13e987640
GC-150: Fix issues with migration across L2 networks.

Our route parsing was very bad. This santizes it by eating the
"via <gateway>" portion of the output, so that we can still bind
to the correct interface.

Change-Id: I4b2283d4cb4a10df07d393fff0f4cd111d960c5f
Merge remote-tracking branch 'origin/grizzly/1.4' into havana14

Change-Id: I09e5ca51b8cc92f1514eb8b763414be49c4f957e
Merge remote-tracking branch 'origin/grizzly/1.4' into grizzly15

Conflicts fixed:
	cobalt/nova/extension/manager.py

Change-Id: I9904a24586215c750d1d7c8a741c57f67061d70a
Merge remote-tracking branch 'origin/grizzly/1.5' into havana15
Merge remote-tracking branch 'origin/havana/1.4' into havana15
Merge remote-tracking branch 'origin/havana/1.5' into ice15

Change-Id: I0c2918334e6e7032bb1060b33d4f5485fdf6e15c