Merge "add tests for ValidateNotificationPeople.getExtraPeople()"