CRM-10043 - merge in changes to Activity.tpl and splitting of ActivityJs...

....tpl with the follow-up assignee changes.