Merge "Fix the (un)watch token to include the namespace name."