Issue #2270339 by YesCT, martin107:  is a misleading variable name in TokenReplaceUnitTestBase.
Issue #2178795 by tim.plunkett, jlbellido, YesCT, Berdir, Xano: Allow DiscoveryInterface::getDefinition() to throw an exception for an invalid plugin.