Add Solr JVM args to config
(cherry picked from commit fec83d46ed87e7d58b7fa81d152daefeca20f076)