Merge proposals dependent on lp:~billy-olsen/charms/trusty/cinder/lp1500635

lp:~billy-olsen/charms/trusty/cinder/lp1500635 has no merge proposals.