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

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