Added UserServer to dependency and upgrade-dependency targets.