CirrusSearch as secondary for nlwiki

Change-Id: I4baa719b9afd9bc085392447de7aa528e916201a
Merge "CirrusSearch as secondary for nlwiki"