SOLR-6067: buildAndRunCollectorChain's Collector argument now always the local variable collector (for safer merging/patching)