Minor: better function used and reformat
Search in index under read lock to prevent entering to isDumb() mode (EA-63656)
Buildserver auto merge