Revert "Merge Master into Stable/havana to support

Reverts att-cloud/cookbook-openstack-object-storage#18