Merge "Revert "Move WildcardMatcher into new 'matcher' package""