PY-6955 Unused import not greyed out if also failing
Merge remote-tracking branch 'origin/master'