Move originator from service level to message level.

Moves the message originator from service level to message level. Requires major bump after merge in master.