Add support to query by chunked cluster id  and address indexes.  Move
cluster merging to appengine.