Last changes compatible to solrcloud cookbook