Cherry pick fix for Bug #1318083 from 'next' branch
[gnuoy,r=tribaal] Cherry pick fix for Bug #1318083 from 'next' branch
Resync charmhelpers for cache bug fixes
[gnuoy,r=tribaal] Resync charmhelpers for apt cache bug fixes