Merge proposals dependent on lp://qastaging/~tribaal/charms/trusty/ceph-osd/backport-apt-cache-fixes

lp://qastaging/~tribaal/charms/trusty/ceph-osd/backport-apt-cache-fixes has no merge proposals.