Merge proposals dependent on lp://qastaging/~hopem/charms/trusty/cinder/fix-ssl-inject

lp://qastaging/~hopem/charms/trusty/cinder/fix-ssl-inject has no merge proposals.