changes to use upstream N2VC libjuju

No match.