Remove unneccessary env variables and update Solr to recent nightly.