Sync charmhelpers to make distro a valid cource option again
[gnuoy,r=james-page] Sync charmhelpers to make distro a valid source option again