Merge branch 'dev' into production
updated JVM mem for solr
Merge branch 'production' into dev