os/ObjectStore: fix rebase errors

These were goofed by d74f1282cd268b4b04cfd9e90ddeac6d1dc6be7e.

Signed-off-by: Sage Weil <sage@inktank.com>