Merge proposals dependent on lp://staging/~chris.macnaughton/openstack-mojo-specs/swift-simple-liberty-mitaka

1. swift-simple-liberty-mitaka
2. Dependent merge proposals