1f64623e80
Sync charmhelpers to pick up bug fixes for 1607 release Change-Id: I3bfa157e548f5a60ade8ae943178c0de8ccfcf58