Added MatchControl and implemented it for matchXY and MatchRaDec

N.b. added some missing tests on matchXY, although it is unchanged by this
changeset
Merge branch 'tickets/DM-855'