Merge proposals dependent on lp://qastaging/~corey.bryant/openstack-charm-testing/rev232

lp://qastaging/~corey.bryant/openstack-charm-testing/rev232 has no merge proposals.