Make sure activities about a friendship are removed when this friendship is cancelled

Fixes #6055

git-svn-id: https://buddypress.svn.wordpress.org/trunk@9241 cdf35c40-ae34-48e0-9cc9-0c9da1808c22