Merge pull request #2408 from raydavis/raywip

CLC-3424 Do not rescue generic Exception
CLC-3164 Include deleted bCourses course sites in SIS ID check