CFD-151- Activity stream tests
Merge remote-tracking branch 'origin/develop' into feature/CFD-193-Activity_stream_insert_update_messages