Solr ingest conf for new ukwa
wrong branch...
Merge branch 'master' into 2.0.x-dev-branch