Prevent send task from swallowing exception
Merge remote-tracking branch 'upstream/master' into HEAD
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Updated rule cache warming queries to be more effective
Exposing ZK client info on CloudSearchServer
Merge remote-tracking branch 'upstream/master'

Conflicts:
	opencommercesearch-common/src/main/config/solr/rules/conf/solrconfig.xml
Support small error tresholds on full feed
Added expiration time to the SequentialDataLoader service
Preparing the 0.3-SNAPSHOT
Added _version_ to default sort fields as tie breaker
Removed unnecessary property on the sequential data loader
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into develop

Conflicts:
	opencommercesearch-api/project/Build.scala
Add include lost on merge
Fixed broken unit test
Revert "Removed unnecessary property on the sequential data loader"

This reverts commit ac512387b3545621104879f308c9bb8fcaec5d35.
Revert "Prevent send task from swallowing exception"

This reverts commit 91d155f331246dce2ba4f46cba593cfd2b8dff3b.
Making expire time atomic long on sequential data loader
solr abtest ocs backend