more work on message upgrades
fix for the message service context
update blockinfo (hackishly!)
watchercontroller converted to messageservice
last bit of legacy messaging code!
remove legacy message class