SOLR custom index fix
Merge branch '008-solr-knowledge' into develop