#3400 starting deprecation of reindex cleanup
#3400 reindex thread dead lock fix