Merge changes I95651dbd,If52f42c5

* changes:
  Rename juju-charms -> charms
  An example of a multi-charm, multi-vdu VNF