Merge "Revert "Remove vendored libjuju""