added back waitFlushValue to optimize
Merge branch 'master' of https://github.com/bogdanalbei/solr