To facilitate reworking CirrusSearch to work with elastica 2.x we will likely be making several breaking changes over the course of multiple weeks. To facilitate this create branches in gerrit for them.
We will need to remember to constantly merge master back into these branches as time goes by, otherwise the final merge will be a real pain.