SOLR-4421,SOLR-4165: Fix wait loop to sleep, reduce max wait time, wait min 1 second

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1446926 13f79535-47bb-0310-9956-ffa450edef68