Merge proposals dependent on lp://qastaging/~billy-olsen/charms/trusty/cinder/backport-lp1398182

lp://qastaging/~billy-olsen/charms/trusty/cinder/backport-lp1398182 has no merge proposals.