Update travis-solr.sh from upstream and rebase