SOLR-6412: Speed up OverseerRolesTest for non nightly runs.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1620141 13f79535-47bb-0310-9956-ffa450edef68
SOLR-6413: Speed up TriLevelCompositeIdRoutingTest for non nightly runs.

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