Resync charmhelpers for cache bug fixes
[gnuoy,r=tribaal] Resync charmhelpers for apt cache bug fixes