Merge branch 'master' of https://github.com/CiscoSystems/juju-vsm
Merge branch 'master' of https://github.com/CiscoSystems/juju-vsm