More flexible SolrQParsing; Fixing guava version to match Solr's guava version