added a warm-up period to Solr JMeter Test
Merge remote-tracking branch 'origin/master'