Bug fixes to make TID forwarding work between trust routers.