SERVER-15729 make index rebuilder error message more clear
Merge remote-tracking branch 'upstream/master'