Updating MWSearch to master

Change-Id: I48480cb6aee6cf68e72af9aebb1e970046e070c7
Merge "Updating MWSearch to master" into wmf/1.22wmf2