Squashed 'modules/libjuju/' changes from c50c361..c127833