Merge branch 'develop' into feature/issue-851-message-export-session-flags

Conflicts:
	go/conversation/tests.py
Merge branch 'feature/issue-851-message-export-session-flags' into feature/issue-852-include-dr-status-in-message-export
restore tests deleted during conflict merge
Merge branch 'feature/issue-851-message-export-session-flags' into feature/issue-852-include-dr-status-in-message-export