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

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