Merge proposals dependent on lp:~gnuoy/charm-helpers/keystone-v3-support

lp:~gnuoy/charm-helpers/keystone-v3-support has no merge proposals.