Disable SSL with environment flag
Add solr environment for staging
Merge branch 'master' into staging_environment_fixes
Merge pull request #656 from Tahi-project/staging_environment_fixes

Staging environment fixes