Merge proposals dependent on lp://staging/~canonical-sysadmins/wordpress/openstack-objectstorage

1. openstack-objectstorage
2. Dependent merge proposals