Also squash .bad file lines containing the phrase "In file included from".
Also update .bad file with "In file included from" lines removed.
Merge pull request #421 from hildeth/squashCLineNumbers

Squash .bad file lines containing "In file included from" in genericArrayInClass-otharrs-inline-iterators.