Refactor ActionTag...

... to accept either Unit or Service prefix.

Also NewActionTag() takes an actionId now
I feel like JoinActionTag would be a less surprising, more searchable name for this fn.