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