* Update the activity model to work with generic foreign key
* Update the messaging text to work with the change to sources

ref #1329