Add CirrusSearch to future wmf branches

Change-Id: Idbde38314db54a9c43b6679de8f559f4b73364b1