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