SSP-2607 Fix potentially inexact person ID/schoolId matching