Remove obsolete conversation batch helpers.
Remove obsolete batch_key params from various conversation methods.
Inline a one-line method that is only ever called in one place.
Remove unnecessary batch_done() call.
Merge branch 'feature/issue-671-old-conversation-cleanup-pt-2' into develop