increase timeout interval
added option stopOnError for e2e tests, hopefully fixed bug in conversation-encryption tests
removed error from e2e tests...
Merged 'dev'.
Merge remote-tracking branch 'origin/feature-cam-473-trust-own-keys' into feature-cam-473-trust-own-keys
added new outgoing drtv to detail
Merge remote-tracking branch 'origin/feature-cam-473-trust-own-keys' into feature-cam-473-trust-own-keys