Merge "Fix object_client methods to accept headers and query param"