Fix test failures.

solr_util must import SolrException so that it can be used in
modules that use it (this has to be changed since this is not how
we want to code). The other was a merge conflict resolution fail.