Fixing failing unit tests for: Encounter autocomplete should filter
results by patient - TRUNK-3231 (cherry picked from commit 90fa76541c0db24f2f6197b89a05f96fe26db0ed)