Squashed 'modules/libjuju/' content from commit c50c361