Merge functionality from #query_solr into #find, and restore 2-arg (path...

... + args) form of #find

Fixes #784