In LocalFriendshipTerminated, send the original client's agentId to the friend being removed instead of the friend's own id.
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim