generified SolrServer, now expects the SolrServer instance in constructor. Tests expected
Merge remote-tracking branch 'origin/master'