Merge proposals dependent on lp://staging/~wallyworld/juju-core/ec2-root-disk-constraint-1.18

1. ec2-root-disk-constraint-1.18
2. Dependent merge proposals