SOLR-5652: Make test more deterministicly random, and increase logging to try and track down strange test failure (merge r1560219)

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