LUCENE-5969: simplify cfs for 5.0

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