Change solr port for staging environment.
Merge remote-tracking branch 'origin/master' into staging