Refactor ActionTag...

... to accept either Unit or Service prefix.

Also NewActionTag() takes an actionId now
back to encoding information in only one place... the id