Test for CRLF (0x0D0A) termination on the routing token before trying to add it again
Test for RoutingTokenLength before checking against termination chars
Merge pull request #1844 from caramorsimon/tokenrouting

Test for CRLF (0x0D0A) termination on the routing token