Merge proposals dependent on lp://staging/~thomnico/charms/precise/clearwater-ralf/openstack-support

lp://staging/~thomnico/charms/precise/clearwater-ralf/openstack-support has no merge proposals.