Trivial update to parameters for _instance_update

Change-Id: I23d2c17ff3c54be97a2710da316eaa4f06cc9425
Merge branch 'havana/1.4' into havana/1.5-merge

The fixed being merged was already included in havana/1.5
and this is a trivial sync-up merge.

Change-Id: I1b1a40c88f289273aa663219bf58d0e71134efd8
Trival fix up for a bad merge that caused discard to be called twice.

Change-Id: I8c6bb5aaa2a25f2dc2fad94813f867866aabb138
Ensure only desired fields are updated during _instance_update(...)

OS-279

The method _instance_update now clears out any local modifications
that may have been made to the instance object before updating/saving
it. This prevents unwanted updates occuring to the database.

This problem was revealed when the instance's host attribute is
temporarily changed during migration. This change is noted in the
object, and during the instance update the host attribute also
get updated. This was an unintended side-effect.

Change-Id: Ibaea13f9d131261ad4882395de76ea3c14df9988
Merge branch 'havana/1.5' into icehouse/1.5

Change-Id: I60fcb018800f7859bed3506beb86eb58add3c202
Trivial clean up of unused, and broken, rpc code from migration.

Change-Id: I6ea80ab724371462264eabce860c507401611232
Trivial updates towards icehouse compatibility

Fixes:
    * rpcapi needs to handle both call and cast for launch instance
    * rpcapi for bless needs to take a host parameter
    * scheduler returns a list of dictionaries from select_destinations
    * schedule request_spec needs num_instances

Change-Id: Iaa9d107f3bd0d3b423bb29591998eabdec6c2d8e
Trivial update to handle new disk_info file and path permissions

In icehouse, Nova now creates a disk_info file in the instance
directory. This file's permissions need to be updated and the base
directory's permissions need to be chowned because that directory
maybe created ealier on in the process and the mkdir will not have
and effect.

Change-Id: Ia7412972fc14b58cf463ee827f28d7c4292027a4
Trivial update to make Cobalt Icehouse compatible

Updates:
    * rpc_common module is gone. Need to use message.MessingTimeout
      exception.
    * The network api no longer takes a conductor_api parameter.

Change-Id: I325086306a0bb68e770dd1f397193d57500ace64
merged upstream/icehouse/1.5