OpenStack Charm Testing

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

  1. consolidate-dfs
  2. Dependent merge proposals

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