LUCENE-5399: add fangs, fix 2 bugs

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