SOLR-5920: fix CursorMarkTest.getRandomCollation() to call termAtt.fillBytesRef() and ts.end() (merged trunk r1582934)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1582935 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5920: mergeprops (merged trunk r1582934)

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