Merge branch 'unlinkcallbyrmbucket'

Conflicts:
	src/rgw/rgw_bucket.cc

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

diff --cc src/rgw/rgw_bucket.cc
index 5f83ba45cb41a006c75f53758dc65eb74df725f3,a3c3b9cb578a7a15922adb2bca126bb783b1a898..f4a245f536cbf50973f74a047f7086032c86186b
--- 1/src/rgw/rgw_bucket.cc
--- 2/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@@ -494,7 -450,7 +494,7 @@@ int rgw_remove_bucket(RGWRados *store, 
      return ret;
    }
  
-   ret = rgw_unlink_bucket(store, info.owner, bucket.tenant, bucket.name);
 -  ret = rgw_unlink_bucket(store, info.owner, bucket.name, false);
++  ret = rgw_unlink_bucket(store, info.owner, bucket.tenant, bucket.name, false);
    if (ret < 0) {
      lderr(store->ctx()) << "ERROR: unable to remove user bucket information" << dendl;
    }