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