Merge SearchContainer into SearchSlave

This is only doing the basic merge and fixing up a few of the callsites.
Improve the API and reducing duplication will happen in followup commits.

Change-Id: I4cd0139ff2cb64805767005def64050df9c40443