SOLR-5349: CloudSolrServer - ZK timeout arguments passed to ZkStateReader are flipped

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1532318 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5272: fix more test bugs

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