#198187 by mcarbone: resolve conflicts of n.uid and r.uid, so the node author uid takes precedence over the revision uid