[HW]   -- Added PersonMatcher and TeamMatcher composite matchers
       -- Cleaned up the matchers used in FacewallRepoTest