LUCENE-5666: move out more uninverting

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene5666@1593850 13f79535-47bb-0310-9956-ffa450edef68
LUCENE-5666: get solr compiling

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