Merge proposals dependent on lp://staging/~gandelman-a/charms/precise/keystone/avoid_upgrade_in_install

lp://staging/~gandelman-a/charms/precise/keystone/avoid_upgrade_in_install has no merge proposals.