Issue #2292889 by Berdir, tim.plunkett: Fixed ContextHandler does not expect ContextDefinitionInterface.