Merge proposals dependent on lp:~tvansteenburgh/charms/precise/cinder-ceph/fix-tests

lp:~tvansteenburgh/charms/precise/cinder-ceph/fix-tests has no merge proposals.