Merge branch 'solr_client' of ssh://git.indexdata.com/home/git/pub/yaz into solr_client