Cherry-pick specific fix for charm-helpers already synced into master. Change-Id: I1ed11fc3f7347d1722dbce8316644cf380011798 Closes-Bug: #1813982
Cherry-pick specific fix for charm-helpers already synced into master. Change-Id: I1ed11fc3f7347d1722dbce8316644cf380011798 Closes-Bug: #1813982