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