Issue #2580723 by AdamPS, Berdir, andypost, darvanen, larowlan, alexpott,...
Issue #2580723 by AdamPS, Berdir, andypost, darvanen, larowlan, alexpott, effulgentsia, catch, dawehner: Fix token system confusion, with new function Token::replacePlain()
(cherry picked from commit 74b25722)