1. Replace NonNativeToken (in docs, guide and elsewhere in the codebase) 2. Update references to TokenPortal and add relevant tests (for both public and private flow) for deposits and cancels Part of #2167
Part of #2167