longer open_timeout for solr - AWS errors
removed whitespace
Merge branch 'develop'