Update CirrusSearch and Elastica to master

Change-Id: I28d7c8256bad177a64de17bdb822c35509af90c0