SOLR-5860: Use leaderConflictResolveWait in WaitForState during recovery/startup, improve logging and force refresh cluster state every 15 seconds

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