Apply patch in cloneCloudServer to set collection

Set defaultCollection in SolrServerUtils when
cloning server rather than in SolrTemplate.
Revert change to SolrTemplate.getSolrServer.