Merge branch 'branchfrom--juju-charms'
authorAdmin <Admin@etsi.org>
Fri, 23 Jun 2017 08:34:14 +0000 (10:34 +0200)
committerAdmin <Admin@etsi.org>
Fri, 23 Jun 2017 08:34:14 +0000 (10:34 +0200)

Trivial merge