Updating CirrusSearch to master

Change-Id: Ifd01ad571024d08fed27bf5b4d33164864bf36ff
Merge "Updating CirrusSearch to master" into wmf/1.24wmf14