Require python-cinderclient >= 1.0.6

Havana Nova should require python-cinderclient 1.0.6, which includes
support for features implemented in Havana and already being used by
Nova.  (APIs for assisted snapshots, and volume migration.)

(Landed in master in commit 831c7e6d.)

Change-Id: Ie2efb90a6e8b985f9bb8f9604eedd84e0d8a8a45
Closes-Bug: #1230925
Avoid clobbering {system_,}metadata dicts passed to instance update

Right now, the dicts for metadata items passed to instance_update
methods will get clobbered as part of the save. This patch makes
a copy before doing the update to avoid this.

Change-Id: I546692779a7467c5cb309059bb46a9bc9b62d5f1
(cherry picked from commit bbe2c5f08f52b1080a857a7e59c227587aa89717)
Merge "Avoid clobbering {system_,}metadata dicts passed to instance update" into stable/havana
Merge "Require python-cinderclient >= 1.0.6" into stable/havana