SOLR-2920: Refactor frequent conditional use of DefaultSolrParams and AppendedSolrParams into factory methods