Wip obj delete fix

This is same as https://github.com/ceph/ceph/pull/2510. Only difference is this one is created on master. Probably, you can close it.