Merge proposals dependent on lp://qastaging/~hopem/charm-helpers/add-rbd-cache-config-support

lp://qastaging/~hopem/charm-helpers/add-rbd-cache-config-support has no merge proposals.