Merge proposals dependent on lp://staging/~raharper/cloud-utils/trunk.fix-lp1604011

lp://staging/~raharper/cloud-utils/trunk.fix-lp1604011 has no merge proposals.