Fixes for Jenkins failures
Fix flapper in search test
Merge pull request #502 from bhariharan/unstable

Fixes for Jenkins failures