Split up MessageMetadataHelper and avoid duplicating its functionality in ConversationWrapper.
Use new MessageMetadataHelper in a few more places.
Fix url token message sensitivity.
Undo silly change.
Use a helper instead of building messages manually.
Merge branch 'feature/adhoc-mdh-improvements-from-821' into develop
Merge branch 'develop' into feature/adhoc-amqp-test-helper