Merge proposals dependent on lp:~corey.bryant/charm-helpers/ocata-uca

lp:~corey.bryant/charm-helpers/ocata-uca has no merge proposals.