Merge proposals dependent on lp:~fwereade/pyjuju/fix-docstrings

lp:~fwereade/pyjuju/fix-docstrings has no merge proposals.