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