LUCENE-5911: fix compile

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_5x@1628194 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5977: Fix tokenstream safety checks in IndexWriter to work across multi-valued fields

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