Added UserServer to dependency and upgrade-dependency targets.
MessageDispatcher patched to work with the moved address & andressType