Merge proposals dependent on lp://qastaging/~bloodearnest/charms/precise/block-storage-broker/fix-local

lp://qastaging/~bloodearnest/charms/precise/block-storage-broker/fix-local has no merge proposals.