Sync charmhelpers to pick up bug fixes for 1607 release Change-Id: I2ce83db365191382708d53b8ee4c5fbb209dbfa4