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