Merge "Fix ClassScanner and re-enable CodeInspectionTest tests"