Merge proposals dependent on lp://staging/~louis/charms/precise/cinder/cinder-add-user-flags

lp://staging/~louis/charms/precise/cinder/cinder-add-user-flags has no merge proposals.