EZP-20438 -  Refactored MatcherFactoryInterface to be more consistent with view providers
EZP-20438 - Fixed wrong import
EZP-20438 - Fixed unit tests in core bundle