Merge proposals dependent on lp:~gnuoy/charm-helpers/more-openstack-tests

lp:~gnuoy/charm-helpers/more-openstack-tests has no merge proposals.