CFD-151- Activity stream tests
Feature/cfd 185 187 fix apache solr on travis ci
Merge branch 'develop' into 196