Merge proposals dependent on lp://qastaging/~corey.bryant/charms/trusty/openstack-dashboard/charm-proof

lp://qastaging/~corey.bryant/charms/trusty/openstack-dashboard/charm-proof has no merge proposals.