Adding back keys 'disk_enum_expr:', 'disk_test_expr:' to swift/chef/data_bags/crowbar/bc-template-swift.json
Merging rackawareness functionality into chef/cookbooks/swift/recipes/ring-compute.rb