BUG: prefix message keys with module names (module mrs done)

https://trello.com/c/tNn7yp1e/

Change-Id: I4bb6ee48281550fe97b979a655afcaf8eb7927fa
Merge "BUG: prefix message keys with module names (module mrs done)"