To your other point about curator: can we just upgrade Curator to 1.0.22 (I think that's the stable 1.0.x version)?  I'm not sure there's much merit for duplicating efforts.