Merged revision(s) 1622449-1622451 from lucene/dev/trunk:
LUCENE-5920: Revert previous commits (but leave the else attributes)
LUCENE-5920: New beasting silencer, variant #2

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