Merge proposals dependent on lp://qastaging/~brad-marshall/charms/trusty/openstack-dashboard/fix-hacluster-config

lp://qastaging/~brad-marshall/charms/trusty/openstack-dashboard/fix-hacluster-config has no merge proposals.