Sync charm-helpers from lp:charm-helpers
Resync charmhelpers for cache bug fixes
[gnuoy,r=tribaal] Resync charmhelpers for cache bug fixes